diff options
577 files changed, 8945 insertions, 8757 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index fa484fc725d..e7946501616 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -195,7 +195,7 @@ class SpellScriptLoader : public ScriptObject public: - bool IsDatabaseBound() const { return true; } + bool IsDatabaseBound() const FINAL { return true; } // Should return a fully valid SpellScript pointer. virtual SpellScript* GetSpellScript() const { return NULL; } @@ -336,9 +336,6 @@ template<class TMap> class MapScript : public UpdatableScript<TMap> // Called when a player leaves the map. virtual void OnPlayerLeave(TMap* /*map*/, Player* /*player*/) { } - - // Called on every map update tick. - virtual void OnUpdate(TMap* /*map*/, uint32 /*diff*/) { } }; class WorldMapScript : public ScriptObject, public MapScript<Map> @@ -356,7 +353,7 @@ class InstanceMapScript : public ScriptObject, public MapScript<InstanceMap> public: - bool IsDatabaseBound() const { return true; } + bool IsDatabaseBound() const FINAL { return true; } // Gets an InstanceScript object for this instance. virtual InstanceScript* GetInstanceScript(InstanceMap* /*map*/) const { return NULL; } @@ -377,7 +374,7 @@ class ItemScript : public ScriptObject public: - bool IsDatabaseBound() const { return true; } + bool IsDatabaseBound() const FINAL { return true; } // Called when a dummy spell effect is triggered on the item. virtual bool OnDummyEffect(Unit* /*caster*/, uint32 /*spellId*/, SpellEffIndex /*effIndex*/, Item* /*target*/) { return false; } @@ -417,7 +414,7 @@ class CreatureScript : public UnitScript, public UpdatableScript<Creature> public: - bool IsDatabaseBound() const { return true; } + bool IsDatabaseBound() const FINAL { return true; } // Called when a dummy spell effect is triggered on the creature. virtual bool OnDummyEffect(Unit* /*caster*/, uint32 /*spellId*/, SpellEffIndex /*effIndex*/, Creature* /*target*/) { return false; } @@ -458,7 +455,7 @@ class GameObjectScript : public ScriptObject, public UpdatableScript<GameObject> public: - bool IsDatabaseBound() const { return true; } + bool IsDatabaseBound() const FINAL { return true; } // Called when a dummy spell effect is triggered on the gameobject. virtual bool OnDummyEffect(Unit* /*caster*/, uint32 /*spellId*/, SpellEffIndex /*effIndex*/, GameObject* /*target*/) { return false; } @@ -505,7 +502,7 @@ class AreaTriggerScript : public ScriptObject public: - bool IsDatabaseBound() const { return true; } + bool IsDatabaseBound() const FINAL { return true; } // Called when the area trigger is activated by a player. virtual bool OnTrigger(Player* /*player*/, AreaTriggerEntry const* /*trigger*/) { return false; } @@ -519,7 +516,7 @@ class BattlegroundScript : public ScriptObject public: - bool IsDatabaseBound() const { return true; } + bool IsDatabaseBound() const FINAL { return true; } // Should return a fully valid Battleground object for the type ID. virtual Battleground* GetBattleground() const = 0; @@ -533,7 +530,7 @@ class OutdoorPvPScript : public ScriptObject public: - bool IsDatabaseBound() const { return true; } + bool IsDatabaseBound() const FINAL { return true; } // Should return a fully valid OutdoorPvP object for the type ID. virtual OutdoorPvP* GetOutdoorPvP() const = 0; @@ -559,7 +556,7 @@ class WeatherScript : public ScriptObject, public UpdatableScript<Weather> public: - bool IsDatabaseBound() const { return true; } + bool IsDatabaseBound() const FINAL { return true; } // Called when the weather changes in the zone this script is associated with. virtual void OnChange(Weather* /*weather*/, WeatherState /*state*/, float /*grade*/) { } @@ -594,7 +591,7 @@ class ConditionScript : public ScriptObject public: - bool IsDatabaseBound() const { return true; } + bool IsDatabaseBound() const FINAL { return true; } // Called when a single condition is checked for a player. virtual bool OnConditionCheck(Condition* /*condition*/, ConditionSourceInfo& /*sourceInfo*/) { return true; } @@ -642,7 +639,7 @@ class TransportScript : public ScriptObject, public UpdatableScript<Transport> public: - bool IsDatabaseBound() const { return true; } + bool IsDatabaseBound() const FINAL { return true; } // Called when a player boards the transport. virtual void OnAddPassenger(Transport* /*transport*/, Player* /*player*/) { } @@ -665,7 +662,7 @@ class AchievementCriteriaScript : public ScriptObject public: - bool IsDatabaseBound() const { return true; } + bool IsDatabaseBound() const FINAL { return true; } // Called when an additional criteria is checked. virtual bool OnCheck(Player* source, Unit* target) = 0; @@ -767,7 +764,7 @@ class GuildScript : public ScriptObject public: - bool IsDatabaseBound() const { return false; } + bool IsDatabaseBound() const FINAL { return false; } // Called when a member is added to the guild. virtual void OnAddMember(Guild* /*guild*/, Player* /*player*/, uint8& /*plRank*/) { } @@ -810,7 +807,7 @@ class GroupScript : public ScriptObject public: - bool IsDatabaseBound() const { return false; } + bool IsDatabaseBound() const FINAL { return false; } // Called when a member is added to a group. virtual void OnAddMember(Group* /*group*/, uint64 /*guid*/) { } diff --git a/src/server/scripts/Commands/cs_account.cpp b/src/server/scripts/Commands/cs_account.cpp index c347648abab..9b98fb5d151 100644 --- a/src/server/scripts/Commands/cs_account.cpp +++ b/src/server/scripts/Commands/cs_account.cpp @@ -33,7 +33,7 @@ class account_commandscript : public CommandScript public: account_commandscript() : CommandScript("account_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand accountSetCommandTable[] = { diff --git a/src/server/scripts/Commands/cs_achievement.cpp b/src/server/scripts/Commands/cs_achievement.cpp index fa97792b85c..8b7151046b3 100644 --- a/src/server/scripts/Commands/cs_achievement.cpp +++ b/src/server/scripts/Commands/cs_achievement.cpp @@ -33,7 +33,7 @@ class achievement_commandscript : public CommandScript public: achievement_commandscript() : CommandScript("achievement_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand achievementCommandTable[] = { diff --git a/src/server/scripts/Commands/cs_arena.cpp b/src/server/scripts/Commands/cs_arena.cpp index 82a1109efd2..b631bab0764 100644 --- a/src/server/scripts/Commands/cs_arena.cpp +++ b/src/server/scripts/Commands/cs_arena.cpp @@ -34,7 +34,7 @@ class arena_commandscript : public CommandScript public: arena_commandscript() : CommandScript("arena_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand arenaCommandTable[] = { diff --git a/src/server/scripts/Commands/cs_ban.cpp b/src/server/scripts/Commands/cs_ban.cpp index 0ed19a76984..c3eb92cae32 100644 --- a/src/server/scripts/Commands/cs_ban.cpp +++ b/src/server/scripts/Commands/cs_ban.cpp @@ -35,7 +35,7 @@ class ban_commandscript : public CommandScript public: ban_commandscript() : CommandScript("ban_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand unbanCommandTable[] = { diff --git a/src/server/scripts/Commands/cs_bf.cpp b/src/server/scripts/Commands/cs_bf.cpp index 6f5c00940f4..4593a88cc90 100644 --- a/src/server/scripts/Commands/cs_bf.cpp +++ b/src/server/scripts/Commands/cs_bf.cpp @@ -31,7 +31,7 @@ class bf_commandscript : public CommandScript public: bf_commandscript() : CommandScript("bf_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand battlefieldcommandTable[] = { diff --git a/src/server/scripts/Commands/cs_cast.cpp b/src/server/scripts/Commands/cs_cast.cpp index d0793e9ca54..1dbfb0c2b8a 100644 --- a/src/server/scripts/Commands/cs_cast.cpp +++ b/src/server/scripts/Commands/cs_cast.cpp @@ -33,7 +33,7 @@ class cast_commandscript : public CommandScript public: cast_commandscript() : CommandScript("cast_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand castCommandTable[] = { diff --git a/src/server/scripts/Commands/cs_character.cpp b/src/server/scripts/Commands/cs_character.cpp index e51052bc18f..8bcf13c2f98 100644 --- a/src/server/scripts/Commands/cs_character.cpp +++ b/src/server/scripts/Commands/cs_character.cpp @@ -35,7 +35,7 @@ class character_commandscript : public CommandScript public: character_commandscript() : CommandScript("character_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand pdumpCommandTable[] = { diff --git a/src/server/scripts/Commands/cs_cheat.cpp b/src/server/scripts/Commands/cs_cheat.cpp index 9dbc9900e58..36d03797426 100644 --- a/src/server/scripts/Commands/cs_cheat.cpp +++ b/src/server/scripts/Commands/cs_cheat.cpp @@ -33,7 +33,7 @@ class cheat_commandscript : public CommandScript public: cheat_commandscript() : CommandScript("cheat_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand cheatCommandTable[] = diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index 6cf27991375..fc7f1fac352 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -40,7 +40,7 @@ class debug_commandscript : public CommandScript public: debug_commandscript() : CommandScript("debug_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand debugPlayCommandTable[] = { diff --git a/src/server/scripts/Commands/cs_deserter.cpp b/src/server/scripts/Commands/cs_deserter.cpp index ef2cd7b45b9..285b68a6162 100644 --- a/src/server/scripts/Commands/cs_deserter.cpp +++ b/src/server/scripts/Commands/cs_deserter.cpp @@ -43,7 +43,7 @@ public: * @brief Returns the command structure for the system. */ - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand deserterInstanceCommandTable[] = { diff --git a/src/server/scripts/Commands/cs_disable.cpp b/src/server/scripts/Commands/cs_disable.cpp index 34738777c85..e6acb17373f 100644 --- a/src/server/scripts/Commands/cs_disable.cpp +++ b/src/server/scripts/Commands/cs_disable.cpp @@ -37,7 +37,7 @@ class disable_commandscript : public CommandScript public: disable_commandscript() : CommandScript("disable_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand removeDisableCommandTable[] = { diff --git a/src/server/scripts/Commands/cs_event.cpp b/src/server/scripts/Commands/cs_event.cpp index 8d1370b16c6..7a5977074a3 100644 --- a/src/server/scripts/Commands/cs_event.cpp +++ b/src/server/scripts/Commands/cs_event.cpp @@ -33,7 +33,7 @@ class event_commandscript : public CommandScript public: event_commandscript() : CommandScript("event_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand eventCommandTable[] = { diff --git a/src/server/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp index 9c8c1b93f74..f3669f7cffd 100644 --- a/src/server/scripts/Commands/cs_gm.cpp +++ b/src/server/scripts/Commands/cs_gm.cpp @@ -36,7 +36,7 @@ class gm_commandscript : public CommandScript public: gm_commandscript() : CommandScript("gm_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand gmCommandTable[] = { diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp index d911d123ec2..762e37dbae7 100644 --- a/src/server/scripts/Commands/cs_go.cpp +++ b/src/server/scripts/Commands/cs_go.cpp @@ -35,7 +35,7 @@ class go_commandscript : public CommandScript public: go_commandscript() : CommandScript("go_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand goCommandTable[] = { diff --git a/src/server/scripts/Commands/cs_honor.cpp b/src/server/scripts/Commands/cs_honor.cpp index 44ebee4f044..9732e2557e9 100644 --- a/src/server/scripts/Commands/cs_honor.cpp +++ b/src/server/scripts/Commands/cs_honor.cpp @@ -33,7 +33,7 @@ class honor_commandscript : public CommandScript public: honor_commandscript() : CommandScript("honor_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand honorAddCommandTable[] = { diff --git a/src/server/scripts/Commands/cs_instance.cpp b/src/server/scripts/Commands/cs_instance.cpp index f1fd9d53423..a0cd306c631 100644 --- a/src/server/scripts/Commands/cs_instance.cpp +++ b/src/server/scripts/Commands/cs_instance.cpp @@ -35,7 +35,7 @@ class instance_commandscript : public CommandScript public: instance_commandscript() : CommandScript("instance_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand instanceCommandTable[] = { diff --git a/src/server/scripts/Commands/cs_learn.cpp b/src/server/scripts/Commands/cs_learn.cpp index 4c01b89a3ae..09060e2e01b 100644 --- a/src/server/scripts/Commands/cs_learn.cpp +++ b/src/server/scripts/Commands/cs_learn.cpp @@ -36,7 +36,7 @@ class learn_commandscript : public CommandScript public: learn_commandscript() : CommandScript("learn_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand learnAllMyCommandTable[] = { diff --git a/src/server/scripts/Commands/cs_lfg.cpp b/src/server/scripts/Commands/cs_lfg.cpp index e2decc6b184..3a9e7a67214 100644 --- a/src/server/scripts/Commands/cs_lfg.cpp +++ b/src/server/scripts/Commands/cs_lfg.cpp @@ -41,7 +41,7 @@ class lfg_commandscript : public CommandScript public: lfg_commandscript() : CommandScript("lfg_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand lfgCommandTable[] = { diff --git a/src/server/scripts/Commands/cs_list.cpp b/src/server/scripts/Commands/cs_list.cpp index 6b8ce7732c5..7595932ecbb 100644 --- a/src/server/scripts/Commands/cs_list.cpp +++ b/src/server/scripts/Commands/cs_list.cpp @@ -36,7 +36,7 @@ class list_commandscript : public CommandScript public: list_commandscript() : CommandScript("list_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand listCommandTable[] = { diff --git a/src/server/scripts/Commands/cs_lookup.cpp b/src/server/scripts/Commands/cs_lookup.cpp index b014eb895be..91f3e5451c4 100644 --- a/src/server/scripts/Commands/cs_lookup.cpp +++ b/src/server/scripts/Commands/cs_lookup.cpp @@ -37,7 +37,7 @@ class lookup_commandscript : public CommandScript public: lookup_commandscript() : CommandScript("lookup_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand lookupPlayerCommandTable[] = { diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index 29014c27740..4e1427dabd2 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -42,7 +42,7 @@ class misc_commandscript : public CommandScript public: misc_commandscript() : CommandScript("misc_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand groupCommandTable[] = { diff --git a/src/server/scripts/Commands/cs_mmaps.cpp b/src/server/scripts/Commands/cs_mmaps.cpp index 2428cb0a239..4d7b42e1885 100644 --- a/src/server/scripts/Commands/cs_mmaps.cpp +++ b/src/server/scripts/Commands/cs_mmaps.cpp @@ -41,7 +41,7 @@ class mmaps_commandscript : public CommandScript public: mmaps_commandscript() : CommandScript("mmaps_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand mmapCommandTable[] = { diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp index 07d1e7d4b18..bac6447a0e6 100644 --- a/src/server/scripts/Commands/cs_modify.cpp +++ b/src/server/scripts/Commands/cs_modify.cpp @@ -36,7 +36,7 @@ class modify_commandscript : public CommandScript public: modify_commandscript() : CommandScript("modify_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand modifyspeedCommandTable[] = { diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 56270b61c30..939075690c9 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -74,7 +74,7 @@ class npc_commandscript : public CommandScript public: npc_commandscript() : CommandScript("npc_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand npcAddCommandTable[] = { diff --git a/src/server/scripts/Commands/cs_quest.cpp b/src/server/scripts/Commands/cs_quest.cpp index e0d67b55989..6b7d10ff7b1 100644 --- a/src/server/scripts/Commands/cs_quest.cpp +++ b/src/server/scripts/Commands/cs_quest.cpp @@ -33,7 +33,7 @@ class quest_commandscript : public CommandScript public: quest_commandscript() : CommandScript("quest_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand questCommandTable[] = { diff --git a/src/server/scripts/Commands/cs_reset.cpp b/src/server/scripts/Commands/cs_reset.cpp index c1bffc6c349..10877c49d55 100644 --- a/src/server/scripts/Commands/cs_reset.cpp +++ b/src/server/scripts/Commands/cs_reset.cpp @@ -35,7 +35,7 @@ class reset_commandscript : public CommandScript public: reset_commandscript() : CommandScript("reset_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand resetCommandTable[] = { diff --git a/src/server/scripts/Commands/cs_server.cpp b/src/server/scripts/Commands/cs_server.cpp index 11b4ebf33ae..2d4fa2765cf 100644 --- a/src/server/scripts/Commands/cs_server.cpp +++ b/src/server/scripts/Commands/cs_server.cpp @@ -35,7 +35,7 @@ class server_commandscript : public CommandScript public: server_commandscript() : CommandScript("server_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand serverIdleRestartCommandTable[] = { diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp index 93ed630fd77..12276102df1 100644 --- a/src/server/scripts/Commands/cs_tele.cpp +++ b/src/server/scripts/Commands/cs_tele.cpp @@ -35,7 +35,7 @@ class tele_commandscript : public CommandScript public: tele_commandscript() : CommandScript("tele_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand teleCommandTable[] = { diff --git a/src/server/scripts/Commands/cs_titles.cpp b/src/server/scripts/Commands/cs_titles.cpp index 4c80f669312..93545c07728 100644 --- a/src/server/scripts/Commands/cs_titles.cpp +++ b/src/server/scripts/Commands/cs_titles.cpp @@ -33,7 +33,7 @@ class titles_commandscript : public CommandScript public: titles_commandscript() : CommandScript("titles_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand titlesSetCommandTable[] = { diff --git a/src/server/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp index b7a89ceb325..c6cfa3218ec 100644 --- a/src/server/scripts/Commands/cs_wp.cpp +++ b/src/server/scripts/Commands/cs_wp.cpp @@ -34,7 +34,7 @@ class wp_commandscript : public CommandScript public: wp_commandscript() : CommandScript("wp_commandscript") { } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand wpCommandTable[] = { diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp index 081e717254d..7bc08b9a7c6 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp @@ -86,7 +86,7 @@ class npc_av_marshal_or_warmaster : public CreatureScript { npc_av_marshal_or_warmasterAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() + void Reset() OVERRIDE { events.Reset(); events.ScheduleEvent(EVENT_CHARGE_TARGET, urand(2 * IN_MILLISECONDS, 12 * IN_MILLISECONDS)); @@ -99,12 +99,12 @@ class npc_av_marshal_or_warmaster : public CreatureScript _hasAura = false; } - void JustRespawned() + void JustRespawned() OVERRIDE { Reset(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { // I have a feeling this isn't blizzlike, but owell, I'm only passing by and cleaning up. if (!_hasAura) @@ -170,7 +170,7 @@ class npc_av_marshal_or_warmaster : public CreatureScript bool _hasAura; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_av_marshal_or_warmasterAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp index c8de8e163d8..a1f33e57907 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp @@ -56,13 +56,13 @@ public: uint64 balindaGUID; uint32 resetTimer; - void Reset() + void Reset() OVERRIDE { waterBoltTimer = 3 * IN_MILLISECONDS; resetTimer = 5 * IN_MILLISECONDS; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -86,7 +86,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_water_elementalAI(creature); } @@ -110,7 +110,7 @@ public: SummonList summons; - void Reset() + void Reset() OVERRIDE { arcaneExplosionTimer = urand(5 * IN_MILLISECONDS, 15 * IN_MILLISECONDS); coneOfColdTimer = 8 * IN_MILLISECONDS; @@ -122,17 +122,17 @@ public: summons.DespawnAll(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(YELL_AGGRO); } - void JustRespawned() + void JustRespawned() OVERRIDE { Reset(); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { CAST_AI(npc_water_elemental::npc_water_elementalAI, summoned->AI())->balindaGUID = me->GetGUID(); summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true)); @@ -140,12 +140,12 @@ public: summons.Summon(summoned); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { summons.DespawnAll(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -196,7 +196,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_balindaAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp index f423bca9372..8bddff621fa 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp @@ -54,7 +54,7 @@ public: uint32 YellTimer; uint32 ResetTimer; - void Reset() + void Reset() OVERRIDE { WhirlwindTimer = urand(1 * IN_MILLISECONDS, 20 * IN_MILLISECONDS); Whirlwind2Timer = urand(1 * IN_MILLISECONDS, 20 * IN_MILLISECONDS); @@ -64,18 +64,18 @@ public: YellTimer = urand(20 * IN_MILLISECONDS, 30 * IN_MILLISECONDS); //20 to 30 seconds } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(YELL_AGGRO); } - void JustRespawned() + void JustRespawned() OVERRIDE { Reset(); Talk(YELL_RESPAWN); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -125,7 +125,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_drektharAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp index 3622259ffcd..1dcf70d28b9 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp @@ -49,7 +49,7 @@ public: uint32 MortalStrikeTimer; uint32 ResetTimer; - void Reset() + void Reset() OVERRIDE { CleaveTimer = urand(1 * IN_MILLISECONDS, 9 * IN_MILLISECONDS); FrighteningShoutTimer = urand(2 * IN_MILLISECONDS, 19 * IN_MILLISECONDS); @@ -59,17 +59,17 @@ public: ResetTimer = 5 * IN_MILLISECONDS; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(YELL_AGGRO); } - void JustRespawned() + void JustRespawned() OVERRIDE { Reset(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -119,7 +119,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_galvangarAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp index 034d8aff42a..f2ba479ac86 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp @@ -50,7 +50,7 @@ public: uint32 ResetTimer; uint32 YellTimer; - void Reset() + void Reset() OVERRIDE { AvatarTimer = 3 * IN_MILLISECONDS; ThunderclapTimer = 4 * IN_MILLISECONDS; @@ -59,12 +59,12 @@ public: YellTimer = urand(20 * IN_MILLISECONDS, 30 * IN_MILLISECONDS); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(YELL_AGGRO); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -108,7 +108,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_vanndarAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp index 867253f5b05..c53026de203 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp @@ -29,7 +29,7 @@ class go_shadowforge_brazier : public GameObjectScript public: go_shadowforge_brazier() : GameObjectScript("go_shadowforge_brazier") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE { if (InstanceScript* instance = go->GetInstanceScript()) { @@ -82,7 +82,7 @@ class at_ring_of_law : public AreaTriggerScript public: at_ring_of_law() : AreaTriggerScript("at_ring_of_law") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) OVERRIDE { if (InstanceScript* instance = player->GetInstanceScript()) { @@ -115,7 +115,7 @@ class npc_grimstone : public CreatureScript public: npc_grimstone() : CreatureScript("npc_grimstone") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_grimstoneAI(creature); } @@ -142,7 +142,7 @@ public: bool CanWalk; - void Reset() + void Reset() OVERRIDE { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -181,7 +181,7 @@ public: MobDeath_Timer = 2500; } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -222,7 +222,7 @@ public: instance->HandleGameObject(instance->GetData64(id), open); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!instance) return; @@ -352,7 +352,7 @@ class npc_phalanx : public CreatureScript public: npc_phalanx() : CreatureScript("npc_phalanx") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_phalanxAI (creature); } @@ -365,14 +365,14 @@ public: uint32 FireballVolley_Timer; uint32 MightyBlow_Timer; - void Reset() + void Reset() OVERRIDE { ThunderClap_Timer = 12000; FireballVolley_Timer = 0; MightyBlow_Timer = 15000; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -430,7 +430,7 @@ class npc_kharan_mighthammer : public CreatureScript public: npc_kharan_mighthammer() : CreatureScript("npc_kharan_mighthammer") { } - 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) @@ -479,7 +479,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -524,7 +524,7 @@ class npc_lokhtos_darkbargainer : public CreatureScript public: npc_lokhtos_darkbargainer() : CreatureScript("npc_lokhtos_darkbargainer") { } - 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) @@ -538,7 +538,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -577,7 +577,7 @@ class npc_dughal_stormwing : public CreatureScript public: npc_dughal_stormwing() : CreatureScript("npc_dughal_stormwing") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { npc_dughal_stormwingAI* dughal_stormwingAI = new npc_dughal_stormwingAI(creature); @@ -588,7 +588,7 @@ public: return dughal_stormwingAI; } - 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) @@ -601,7 +601,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS) { @@ -615,7 +615,7 @@ public: { npc_dughal_stormwingAI(Creature* creature) : npc_escortAI(creature) {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -634,10 +634,10 @@ public: } } - void EnterCombat(Unit* who) {} - void Reset() {} + void EnterCombat(Unit* who) OVERRIDE {} + void Reset() OVERRIDE {} - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (IsBeingEscorted && killer == me) { @@ -648,7 +648,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return; if ((instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_FAILED || instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_ENDED)&& instance->GetData(DATA_DUGHAL) == ENCOUNTER_STATE_ENDED) @@ -693,7 +693,7 @@ class npc_marshal_windsor : public CreatureScript public: npc_marshal_windsor() : CreatureScript("npc_marshal_windsor") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { npc_marshal_windsorAI* marshal_windsorAI = new npc_marshal_windsorAI(creature); @@ -721,7 +721,7 @@ public: return marshal_windsorAI; } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == 4322) { @@ -743,7 +743,7 @@ public: instance = creature->GetInstanceScript(); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -788,7 +788,7 @@ public: } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { switch (urand(0, 2)) { @@ -804,14 +804,14 @@ public: } } - void Reset() {} + void Reset() OVERRIDE {} - void JustDied(Unit* slayer) + void JustDied(Unit* slayer) OVERRIDE { instance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_FAILED); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return; @@ -877,7 +877,7 @@ class npc_marshal_reginald_windsor : public CreatureScript public: npc_marshal_reginald_windsor() : CreatureScript("npc_marshal_reginald_windsor") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { npc_marshal_reginald_windsorAI* marshal_reginald_windsorAI = new npc_marshal_reginald_windsorAI(creature); @@ -926,7 +926,7 @@ public: { } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { wp = waypointId; switch (waypointId) @@ -984,7 +984,8 @@ public: } } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (HasEscortState(STATE_ESCORT_ESCORTING)) return; @@ -1003,7 +1004,7 @@ public: } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { switch (urand(0, 2)) { @@ -1018,14 +1019,14 @@ public: break; } } - void Reset() {} + void Reset() OVERRIDE {} - void JustDied(Unit* slayer) + void JustDied(Unit* slayer) OVERRIDE { instance->SetData(DATA_QUEST_JAIL_BREAK, ENCOUNTER_STATE_FAILED); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return; @@ -1086,7 +1087,7 @@ class npc_tobias_seecher : public CreatureScript public: npc_tobias_seecher() : CreatureScript("npc_tobias_seecher") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { npc_tobias_seecherAI* tobias_seecherAI = new npc_tobias_seecherAI(creature); @@ -1099,7 +1100,7 @@ public: return tobias_seecherAI; } - 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) @@ -1112,7 +1113,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS) { @@ -1126,10 +1127,10 @@ public: { npc_tobias_seecherAI(Creature* creature) : npc_escortAI(creature) {} - void EnterCombat(Unit* who) {} - void Reset() {} + void EnterCombat(Unit* who) OVERRIDE {} + void Reset() OVERRIDE {} - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (IsBeingEscorted && killer == me) { @@ -1140,7 +1141,7 @@ public: } } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -1159,7 +1160,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (instance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return; @@ -1204,7 +1205,7 @@ class npc_rocknot : public CreatureScript public: npc_rocknot() : CreatureScript("npc_rocknot") { } - bool OnQuestReward(Player* /*player*/, Creature* creature, Quest const* quest, uint32 /*item*/) + bool OnQuestReward(Player* /*player*/, Creature* creature, Quest const* quest, uint32 /*item*/) OVERRIDE { InstanceScript* instance = creature->GetInstanceScript(); if (!instance) @@ -1234,7 +1235,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_rocknotAI(creature); } @@ -1251,7 +1252,7 @@ public: uint32 BreakKeg_Timer; uint32 BreakDoor_Timer; - void Reset() + void Reset() OVERRIDE { if (HasEscortState(STATE_ESCORT_ESCORTING)) return; @@ -1266,7 +1267,7 @@ public: go->SetGoState((GOState)state); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (!instance) return; @@ -1292,7 +1293,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!instance) return; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp index 97de0b1b2da..dd251a4fb10 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_ambassador_flamelash.cpp @@ -29,7 +29,7 @@ class boss_ambassador_flamelash : public CreatureScript public: boss_ambassador_flamelash() : CreatureScript("boss_ambassador_flamelash") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_ambassador_flamelashAI (creature); } @@ -41,13 +41,13 @@ public: uint32 FireBlast_Timer; uint32 Spirit_Timer; - void Reset() + void Reset() OVERRIDE { FireBlast_Timer = 2000; Spirit_Timer = 24000; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} void SummonSpirits(Unit* victim) { @@ -55,7 +55,7 @@ public: Spirit->AI()->AttackStart(victim); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp index 66458a30113..d48fadd4564 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_anubshiah.cpp @@ -33,7 +33,7 @@ class boss_anubshiah : public CreatureScript public: boss_anubshiah() : CreatureScript("boss_anubshiah") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_anubshiahAI (creature); } @@ -48,7 +48,7 @@ public: uint32 DemonArmor_Timer; uint32 EnvelopingWeb_Timer; - void Reset() + void Reset() OVERRIDE { ShadowBolt_Timer = 7000; CurseOfTongues_Timer = 24000; @@ -57,9 +57,9 @@ public: EnvelopingWeb_Timer = 16000; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp index 3a058e1b9bb..b932b384df4 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp @@ -37,7 +37,7 @@ class boss_emperor_dagran_thaurissan : public CreatureScript public: boss_emperor_dagran_thaurissan() : CreatureScript("boss_emperor_dagran_thaurissan") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_draganthaurissanAI (creature); } @@ -54,25 +54,25 @@ public: uint32 AvatarOfFlame_Timer; //uint32 Counter; - void Reset() + void Reset() OVERRIDE { HandOfThaurissan_Timer = 4000; AvatarOfFlame_Timer = 25000; //Counter= 0; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); me->CallForHelp(VISIBLE_RANGE); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Creature* Moira = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(DATA_MOIRA) : 0)) { @@ -81,7 +81,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/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp index 85256d763c3..9cdbba7f6a9 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_general_angerforge.cpp @@ -31,7 +31,7 @@ class boss_general_angerforge : public CreatureScript public: boss_general_angerforge() : CreatureScript("boss_general_angerforge") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_general_angerforgeAI (creature); } @@ -46,7 +46,7 @@ public: uint32 Adds_Timer; bool Medics; - void Reset() + void Reset() OVERRIDE { MightyBlow_Timer = 8000; HamString_Timer = 12000; @@ -55,7 +55,7 @@ public: Medics = false; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} void SummonAdds(Unit* victim) { @@ -69,7 +69,7 @@ public: SummonedMedic->AI()->AttackStart(victim); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp index b70bbf670bc..4c8567ee782 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp @@ -30,7 +30,7 @@ class boss_gorosh_the_dervish : public CreatureScript public: boss_gorosh_the_dervish() : CreatureScript("boss_gorosh_the_dervish") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_gorosh_the_dervishAI (creature); } @@ -42,17 +42,17 @@ public: uint32 WhirlWind_Timer; uint32 MortalStrike_Timer; - void Reset() + void Reset() OVERRIDE { WhirlWind_Timer = 12000; MortalStrike_Timer = 22000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp index e3f4a665e03..705382baad1 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_grizzle.cpp @@ -31,7 +31,7 @@ class boss_grizzle : public CreatureScript public: boss_grizzle() : CreatureScript("boss_grizzle") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_grizzleAI (creature); } @@ -43,15 +43,15 @@ public: uint32 GroundTremor_Timer; uint32 Frenzy_Timer; - void Reset() + void Reset() OVERRIDE { GroundTremor_Timer = 12000; Frenzy_Timer =0; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp index 680b358418c..69393e93fc0 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp @@ -32,7 +32,7 @@ class boss_high_interrogator_gerstahn : public CreatureScript public: boss_high_interrogator_gerstahn() : CreatureScript("boss_high_interrogator_gerstahn") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_high_interrogator_gerstahnAI (creature); } @@ -46,7 +46,7 @@ public: uint32 PsychicScream_Timer; uint32 ShadowShield_Timer; - void Reset() + void Reset() OVERRIDE { ShadowWordPain_Timer = 4000; ManaBurn_Timer = 14000; @@ -54,9 +54,9 @@ public: ShadowShield_Timer = 8000; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp index c5461484aec..332bbf09f76 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_magmus.cpp @@ -35,7 +35,7 @@ class boss_magmus : public CreatureScript public: boss_magmus() : CreatureScript("boss_magmus") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_magmusAI (creature); } @@ -47,15 +47,15 @@ public: uint32 FieryBurst_Timer; uint32 WarStomp_Timer; - void Reset() + void Reset() OVERRIDE { FieryBurst_Timer = 5000; WarStomp_Timer =0; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -81,7 +81,7 @@ public: DoMeleeAttackIfReady(); } // When he die open door to last chamber - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (InstanceScript* instance = killer->GetInstanceScript()) instance->HandleGameObject(instance->GetData64(DATA_THRONE_DOOR), true); diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp index 6de2a4999af..7b5da3db58d 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_moira_bronzebeard.cpp @@ -34,7 +34,7 @@ class boss_moira_bronzebeard : public CreatureScript public: boss_moira_bronzebeard() : CreatureScript("boss_moira_bronzebeard") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_moira_bronzebeardAI (creature); } @@ -48,7 +48,7 @@ public: uint32 ShadowWordPain_Timer; uint32 Smite_Timer; - void Reset() + void Reset() OVERRIDE { Heal_Timer = 12000; //These times are probably wrong MindBlast_Timer = 16000; @@ -56,9 +56,9 @@ public: Smite_Timer = 8000; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp index 4931608ea00..7c7664249de 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp @@ -48,7 +48,7 @@ class boss_gloomrel : public CreatureScript public: boss_gloomrel() : CreatureScript("boss_gloomrel") { } - 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) @@ -77,7 +77,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestRewardStatus(QUEST_SPECTRAL_CHALICE) == 1 && player->GetSkillValue(SKILL_MINING) >= DATA_SKILLPOINT_MIN && !player->HasSpell(SPELL_SMELT_DARK_IRON)) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEACH_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -107,7 +107,7 @@ class boss_doomrel : public CreatureScript public: boss_doomrel() : CreatureScript("boss_doomrel") { } - 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) @@ -130,7 +130,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_CHALLENGE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->SEND_GOSSIP_MENU(2601, creature->GetGUID()); @@ -138,7 +138,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_doomrelAI (creature); } @@ -157,7 +157,7 @@ public: uint32 DemonArmor_Timer; bool Voidwalkers; - void Reset() + void Reset() OVERRIDE { ShadowVolley_Timer = 10000; Immolate_Timer = 18000; @@ -179,11 +179,11 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { me->RemoveAllAuras(); me->DeleteThreatList(); @@ -196,13 +196,13 @@ public: instance->SetData64(DATA_EVENSTARTER, 0); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_GHOSTKILL, 1); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp index 0bb57545230..b9ff40f8285 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp @@ -69,7 +69,7 @@ class instance_blackrock_depths : public InstanceMapScript public: instance_blackrock_depths() : InstanceMapScript("instance_blackrock_depths", 230) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_blackrock_depths_InstanceMapScript(map); } @@ -212,7 +212,7 @@ public: } } - void SetData64(uint32 type, uint64 data) + void SetData64(uint32 type, uint64 data) OVERRIDE { TC_LOG_DEBUG(LOG_FILTER_TSCR, "Instance Blackrock Depths: SetData64 update (Type: %u Data " UI64FMTD ")", type, data); @@ -228,7 +228,7 @@ public: } } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { TC_LOG_DEBUG(LOG_FILTER_TSCR, "Instance Blackrock Depths: SetData update (Type: %u Data %u)", type, data); @@ -275,7 +275,7 @@ public: } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -300,7 +300,7 @@ public: return 0; } - uint64 GetData64(uint32 data) const + uint64 GetData64(uint32 data) const OVERRIDE { switch (data) { diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp index dfd808041bd..59581204b05 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp @@ -45,12 +45,12 @@ public: { boss_drakkisathAI(Creature* creature) : BossAI(creature, DATA_GENERAL_DRAKKISATH) {} - void Reset() + void Reset() OVERRIDE { _Reset(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_FIRE_NOVA, 6000); @@ -59,12 +59,12 @@ public: events.ScheduleEvent(EVENT_THUNDERCLAP, 17000); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -100,7 +100,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_drakkisathAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gizrul_the_slavener.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gizrul_the_slavener.cpp index e0b4d6cab18..f1bd81f2e6a 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gizrul_the_slavener.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gizrul_the_slavener.cpp @@ -48,29 +48,29 @@ public: { boss_gizrul_the_slavenerAI(Creature* creature) : BossAI(creature, DATA_GIZRUL_THE_SLAVENER) {} - void Reset() + void Reset() OVERRIDE { _Reset(); } - void IsSummonedBy(Unit* /*summoner*/) + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE { me->GetMotionMaster()->MovePath(GIZRUL_PATH, false); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_FATAL_BITE, urand(17000,20000)); events.ScheduleEvent(EVENT_INFECTED_BITE, urand(10000,12000)); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -100,7 +100,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_gizrul_the_slavenerAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp index f20798d64fb..dbc3056b1ff 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp @@ -57,7 +57,7 @@ public: bool SummonedRend; - void Reset() + void Reset() OVERRIDE { SummonedRend = false; if (instance->GetBossState(DATA_GYTH) == IN_PROGRESS) @@ -67,7 +67,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); @@ -77,12 +77,12 @@ public: events.ScheduleEvent(EVENT_KNOCK_AWAY, urand(12000, 18000)); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { instance->SetBossState(DATA_GYTH, DONE); } - void SetData(uint32 /*type*/, uint32 data) + void SetData(uint32 /*type*/, uint32 data) OVERRIDE { switch (data) { @@ -94,7 +94,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!SummonedRend && HealthBelowPct(5)) @@ -160,7 +160,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_gythAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp index 71c3efdfda2..630d6ff2a0d 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_halycon.cpp @@ -47,20 +47,20 @@ public: { boss_halyconAI(Creature* creature) : BossAI(creature, DATA_HALYCON) {} - void Reset() + void Reset() OVERRIDE { _Reset(); Summoned = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_REND, urand(17000,20000)); events.ScheduleEvent(EVENT_THRASH, urand(10000,12000)); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { me->SummonCreature(NPC_GIZRUL_THE_SLAVENER, SummonLocation, TEMPSUMMON_TIMED_DESPAWN, 300000); Talk(EMOTE_DEATH); @@ -68,7 +68,7 @@ public: Summoned = true; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -99,7 +99,7 @@ public: bool Summoned; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_halyconAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp index 3bd46be1c1b..54ed5d44e34 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_highlord_omokk.cpp @@ -37,7 +37,7 @@ class boss_highlord_omokk : public CreatureScript public: boss_highlord_omokk() : CreatureScript("boss_highlord_omokk") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_highlordomokkAI(creature); } @@ -46,24 +46,24 @@ public: { boss_highlordomokkAI(Creature* creature) : BossAI(creature, DATA_HIGHLORD_OMOKK) {} - void Reset() + void Reset() OVERRIDE { _Reset(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_FRENZY, 20000); events.ScheduleEvent(EVENT_KNOCK_AWAY, 18000); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp index fc6d3f7d4db..608cb75bbb2 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_mother_smolderweb.cpp @@ -38,7 +38,7 @@ class boss_mother_smolderweb : public CreatureScript public: boss_mother_smolderweb() : CreatureScript("boss_mother_smolderweb") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_mothersmolderwebAI(creature); } @@ -47,30 +47,30 @@ public: { boss_mothersmolderwebAI(Creature* creature) : BossAI(creature, DATA_MOTHER_SMOLDERWEB) {} - void Reset() + void Reset() OVERRIDE { _Reset(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_CRYSTALIZE, 20 * IN_MILLISECONDS); events.ScheduleEvent(EVENT_MOTHERS_MILK, 10 * IN_MILLISECONDS); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { if (me->GetHealth() <= damage) DoCast(me, SPELL_SUMMON_SPIRE_SPIDERLING, true); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp index b792a49b714..2b68b640720 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_overlord_wyrmthalak.cpp @@ -50,7 +50,7 @@ class boss_overlord_wyrmthalak : public CreatureScript public: boss_overlord_wyrmthalak() : CreatureScript("boss_overlord_wyrmthalak") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_overlordwyrmthalakAI(creature); } @@ -61,13 +61,13 @@ public: bool Summoned; - void Reset() + void Reset() OVERRIDE { _Reset(); Summoned = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_BLAST_WAVE, 20 * IN_MILLISECONDS); @@ -76,12 +76,12 @@ public: events.ScheduleEvent(EVENT_KNOCK_AWAY, 12 * IN_MILLISECONDS); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp index fdf3f0066ba..458e4c07a40 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp @@ -77,7 +77,7 @@ public: { boss_pyroguard_emberseerAI(Creature* creature) : BossAI(creature, DATA_PYROGAURD_EMBERSEER) {} - void Reset() + void Reset() OVERRIDE { if (instance) { @@ -98,7 +98,7 @@ public: } } - void SetData(uint32 /*type*/, uint32 data) + void SetData(uint32 /*type*/, uint32 data) OVERRIDE { switch (data) { @@ -122,7 +122,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { // ### TODO Check combat timing ### events.ScheduleEvent(EVENT_FIRENOVA, 6000); @@ -130,7 +130,7 @@ public: events.ScheduleEvent(EVENT_PYROBLAST, 14000); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -143,7 +143,7 @@ public: } } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_ENCAGE_EMBERSEER) { @@ -205,7 +205,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) { @@ -314,7 +314,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_pyroguard_emberseerAI(creature); } @@ -342,19 +342,19 @@ public: { npc_blackhand_incarceratorAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC|UNIT_FLAG_IMMUNE_TO_NPC); if (Creature* Emberseer = me->FindNearestCreature(NPC_PYROGAURD_EMBERSEER, 30.0f, true)) Emberseer->AI()->SetData(1, 3); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { me->DespawnOrUnsummon(10000); } - void SetData(uint32 data, uint32 value) + void SetData(uint32 data, uint32 value) OVERRIDE { if (data == 1 && value == 1) { @@ -369,7 +369,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { // Used to close doors if (Creature* Emberseer = me->FindNearestCreature(NPC_PYROGAURD_EMBERSEER, 30.0f, true)) @@ -388,7 +388,7 @@ public: _events.ScheduleEvent(EVENT_ENCAGE, urand(10000, 20000)); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { @@ -436,7 +436,7 @@ public: EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_blackhand_incarceratorAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp index fec82982504..a20822839e6 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_quartermaster_zigris.cpp @@ -42,24 +42,24 @@ public: { boss_quatermasterzigrisAI(Creature* creature) : BossAI(creature, DATA_QUARTERMASTER_ZIGRIS) {} - void Reset() + void Reset() OVERRIDE { _Reset(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_SHOOT, 1000); events.ScheduleEvent(EVENT_STUN_BOMB, 16000); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -87,7 +87,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_quatermasterzigrisAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp index eca24289945..6e3868807a5 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp @@ -166,14 +166,14 @@ public: { boss_rend_blackhandAI(Creature* creature) : BossAI(creature, DATA_WARCHIEF_REND_BLACKHAND) { } - void Reset() + void Reset() OVERRIDE { _Reset(); gythEvent = false; victorGUID = 0; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_WHIRLWIND, urand (13000, 15000)); @@ -181,14 +181,14 @@ public: events.ScheduleEvent(EVENT_MORTAL_STRIKE, urand (17000, 19000)); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); if (Creature* victor = me->FindNearestCreature(NPC_LORD_VICTOR_NEFARIUS, 75.0f, true)) victor->AI()->SetData(1, 2); } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { if (instance && type == AREATRIGGER && data == AREATRIGGER_BLACKROCK_STADIUM) { @@ -208,7 +208,7 @@ public: } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type == WAYPOINT_MOTION_TYPE) { @@ -226,7 +226,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (gythEvent) { @@ -435,7 +435,7 @@ public: uint64 portcullisGUID; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_rend_blackhandAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp index b4a62ecb918..1936e5e72d0 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp @@ -39,7 +39,7 @@ class boss_shadow_hunter_voshgajin : public CreatureScript public: boss_shadow_hunter_voshgajin() : CreatureScript("boss_shadow_hunter_voshgajin") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_shadowvoshAI(creature); } @@ -48,13 +48,13 @@ public: { boss_shadowvoshAI(Creature* creature) : BossAI(creature, DATA_SHADOW_HUNTER_VOSHGAJIN) {} - void Reset() + void Reset() OVERRIDE { _Reset(); //DoCast(me, SPELL_ICEARMOR, true); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 2 * IN_MILLISECONDS); @@ -62,12 +62,12 @@ public: events.ScheduleEvent(EVENT_CLEAVE, 14 * IN_MILLISECONDS); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp index ff4b080282e..c4abaac158c 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_the_beast.cpp @@ -39,7 +39,7 @@ class boss_the_beast : public CreatureScript public: boss_the_beast() : CreatureScript("boss_the_beast") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_thebeastAI(creature); } @@ -48,12 +48,12 @@ public: { boss_thebeastAI(Creature* creature) : BossAI(creature, DATA_THE_BEAST) {} - void Reset() + void Reset() OVERRIDE { _Reset(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_FLAME_BREAK, 12 * IN_MILLISECONDS); @@ -61,12 +61,12 @@ public: events.ScheduleEvent(EVENT_TERRIFYING_ROAR, 23 * IN_MILLISECONDS); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_urok_doomhowl.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_urok_doomhowl.cpp index dd21d6ebdb0..afee357aad5 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_urok_doomhowl.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_urok_doomhowl.cpp @@ -48,12 +48,12 @@ public: { boss_urok_doomhowlAI(Creature* creature) : BossAI(creature, DATA_UROK_DOOMHOWL) {} - void Reset() + void Reset() OVERRIDE { _Reset(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(SPELL_REND, urand(17000,20000)); @@ -61,12 +61,12 @@ public: Talk(SAY_AGGRO); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -96,7 +96,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_urok_doomhowlAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp index 7c4a976bca8..e3423fd02b6 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp @@ -45,7 +45,7 @@ class boss_warmaster_voone : public CreatureScript public: boss_warmaster_voone() : CreatureScript("boss_warmaster_voone") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_warmastervooneAI(creature); } @@ -54,12 +54,12 @@ public: { boss_warmastervooneAI(Creature* creature) : BossAI(creature, DATA_WARMASTER_VOONE) {} - void Reset() + void Reset() OVERRIDE { _Reset(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_SNAP_KICK, 8 * IN_MILLISECONDS); @@ -70,12 +70,12 @@ public: events.ScheduleEvent(EVENT_THROW_AXE, 1 * IN_MILLISECONDS); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp index ff0ff496b5a..b334c5c44b6 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp @@ -280,7 +280,7 @@ public: } } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -295,7 +295,7 @@ public: } } - uint64 GetData64(uint32 type) const + uint64 GetData64(uint32 type) const OVERRIDE { switch (type) { @@ -592,7 +592,7 @@ public: uint64 go_portcullis_tobossrooms; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_blackrock_spireMapScript(map); } @@ -607,7 +607,7 @@ class at_dragonspire_hall : public AreaTriggerScript public: at_dragonspire_hall() : AreaTriggerScript("at_dragonspire_hall") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) OVERRIDE { if (player && player->IsAlive()) { @@ -631,7 +631,7 @@ class at_blackrock_stadium : public AreaTriggerScript public: at_blackrock_stadium() : AreaTriggerScript("at_blackrock_stadium") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) OVERRIDE { if (player && player->IsAlive()) { diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp index d4a9d81fdb0..9d25719a52b 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp @@ -52,7 +52,7 @@ public: { boss_broodlordAI(Creature* creature) : BossAI(creature, BOSS_BROODLORD) { } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance->GetBossState(BOSS_VAELASTRAZ) != DONE) { @@ -70,7 +70,7 @@ public: events.ScheduleEvent(EVENT_CHECK, 1000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -114,7 +114,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_broodlordAI (creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp index b6eb97ac64c..507786aff20 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp @@ -173,7 +173,7 @@ public: EnterEvadeMode(); } - void Reset() + void Reset() OVERRIDE { _Reset(); @@ -181,7 +181,7 @@ public: Enraged = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance && instance->GetBossState(BOSS_FLAMEGOR) != DONE) { @@ -197,7 +197,7 @@ public: events.ScheduleEvent(EVENT_FRENZY, 15000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -280,7 +280,7 @@ public: bool Enraged; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_chromaggusAI (creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp index 7d21825851a..2c35d6ce140 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_ebonroc.cpp @@ -43,7 +43,7 @@ public: { boss_ebonrocAI(Creature* creature) : BossAI(creature, BOSS_EBONROC) { } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance && instance->GetBossState(BOSS_BROODLORD) != DONE) { @@ -57,7 +57,7 @@ public: events.ScheduleEvent(EVENT_SHADOWOFEBONROC, urand(8000, 10000)); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -90,7 +90,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_ebonrocAI (creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp index b32db2be450..2cbcb1d9b58 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_firemaw.cpp @@ -43,7 +43,7 @@ public: { boss_firemawAI(Creature* creature) : BossAI(creature, BOSS_FIREMAW) { } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance && instance->GetBossState(BOSS_BROODLORD) != DONE) { @@ -57,7 +57,7 @@ public: events.ScheduleEvent(EVENT_FLAMEBUFFET, 5000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -92,7 +92,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_firemawAI (creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp index f5a3cd3e45f..a1525b46c7c 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp @@ -48,7 +48,7 @@ public: { boss_flamegorAI(Creature* creature) : BossAI(creature, BOSS_FLAMEGOR) { } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance && instance->GetBossState(BOSS_BROODLORD) != DONE) { @@ -62,7 +62,7 @@ public: events.ScheduleEvent(EVENT_FRENZY, 10000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -98,7 +98,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_flamegorAI (creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp index 6f90f61f420..75d1cad0820 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp @@ -168,7 +168,7 @@ public: { boss_victor_nefariusAI(Creature* creature) : BossAI(creature, BOSS_NEFARIAN) { } - void Reset() + void Reset() OVERRIDE { if (me->GetMapId() == 469) { @@ -185,7 +185,7 @@ public: } } - void JustReachedHome() + void JustReachedHome() OVERRIDE { Reset(); } @@ -207,7 +207,7 @@ public: events.ScheduleEvent(EVENT_SPAWN_ADD, 10000); } - void SummonedCreatureDies(Creature* summon, Unit* /*killer*/) + void SummonedCreatureDies(Creature* summon, Unit* /*killer*/) OVERRIDE { if (summon->GetEntry() != NPC_NEFARIAN) { @@ -218,9 +218,9 @@ public: } } - void JustSummoned(Creature* /*summon*/) {} + void JustSummoned(Creature* /*summon*/) OVERRIDE {} - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { if (instance && type == 1 && data == 1) { @@ -234,7 +234,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) { @@ -361,7 +361,7 @@ public: } } - 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) { @@ -375,7 +375,7 @@ public: uint32 SpawnedAdds; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_victor_nefariusAI (creature); } @@ -390,19 +390,19 @@ public: { boss_nefarianAI(Creature* creature) : BossAI(creature, BOSS_NEFARIAN) { } - void Reset() + void Reset() OVERRIDE { Phase3 = false; canDespawn = false; DespawnTimer = 30000; } - void JustReachedHome() + void JustReachedHome() OVERRIDE { canDespawn = true; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { events.ScheduleEvent(EVENT_SHADOWFLAME, 12000); events.ScheduleEvent(EVENT_FEAR, urand(25000, 35000)); @@ -413,13 +413,13 @@ public: Talk(SAY_RANDOM); } - void JustDied(Unit* /*Killer*/) + void JustDied(Unit* /*Killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (rand()%5) return; @@ -427,7 +427,7 @@ public: Talk(SAY_SLAY, victim->GetGUID()); } - 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 UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (canDespawn && DespawnTimer <= diff) { @@ -571,7 +571,7 @@ public: }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_nefarianAI (creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp index 6e20b58a6d6..cd27737fece 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp @@ -70,7 +70,7 @@ public: { boss_razorgoreAI(Creature* creature) : BossAI(creature, BOSS_RAZORGORE) { } - void Reset() + void Reset() OVERRIDE { _Reset(); @@ -79,7 +79,7 @@ public: instance->SetData(DATA_EGG_EVENT, NOT_STARTED); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); @@ -100,19 +100,19 @@ public: me->SetHealth(me->GetMaxHealth()); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_PHASE_TWO) DoChangePhase(); } - void DamageTaken(Unit* /*who*/, uint32& damage) + void DamageTaken(Unit* /*who*/, uint32& damage) OVERRIDE { if (!secondPhase) damage = 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -154,7 +154,7 @@ public: bool secondPhase; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_razorgoreAI (creature); } @@ -165,7 +165,7 @@ class go_orb_of_domination : public GameObjectScript public: go_orb_of_domination() : GameObjectScript("go_orb_of_domination") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (InstanceScript* instance = go->GetInstanceScript()) if (instance->GetData(DATA_EGG_EVENT) != DONE) @@ -193,13 +193,13 @@ class spell_egg_event : public SpellScriptLoader instance->SetData(DATA_EGG_EVENT, SPECIAL); } - void Register() + void Register() OVERRIDE { OnHit += SpellHitFn(spell_egg_eventSpellScript::HandleOnHit); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_egg_eventSpellScript(); } diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp index e7626c92ec0..6c9d093c58a 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp @@ -75,7 +75,7 @@ public: creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void Reset() + void Reset() OVERRIDE { _Reset(); @@ -85,7 +85,7 @@ public: HasYelled = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); @@ -109,7 +109,7 @@ public: events.ScheduleEvent(EVENT_SPEECH_1, 1000); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (rand()%5) return; @@ -117,7 +117,7 @@ public: Talk(SAY_KILLTARGET, victim->GetGUID()); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { events.Update(diff); @@ -216,7 +216,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 == 0) { @@ -230,7 +230,7 @@ public: bool HasYelled; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_vaelAI (creature); } diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp index e0a813a6590..d904e0a89f8 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp @@ -215,7 +215,7 @@ public: return true; } - uint64 GetData64(uint32 id) const + uint64 GetData64(uint32 id) const OVERRIDE { switch (id) { @@ -233,7 +233,7 @@ public: return 0; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { if (type == DATA_EGG_EVENT) { @@ -343,7 +343,7 @@ public: uint64 NefarianGUID; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_blackwing_lair_InstanceMapScript(map); } diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp index c4b84996f7c..39788067b8a 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp @@ -43,7 +43,7 @@ class boss_mr_smite : public CreatureScript public: boss_mr_smite() : CreatureScript("boss_mr_smite") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_mr_smiteAI (creature); } @@ -66,7 +66,7 @@ public: uint32 uiPhase; uint32 uiTimer; - void Reset() + void Reset() OVERRIDE { uiTrashTimer = urand(5000, 9000); uiSlamTimer = 9000; @@ -80,7 +80,7 @@ public: SetEquipmentSlots(false, EQUIP_SWORD, EQUIP_UNEQUIP, EQUIP_NO_CHANGE); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } @@ -94,7 +94,7 @@ public: return true; } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (!UpdateVictim()) return; @@ -166,7 +166,7 @@ public: DoMeleeAttackIfReady(); } - void MovementInform(uint32 uiType, uint32 /*uiId*/) + void MovementInform(uint32 uiType, uint32 /*uiId*/) OVERRIDE { if (uiType != POINT_MOTION_TYPE) return; diff --git a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp index 991056d0ce0..38d10107094 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp @@ -39,7 +39,7 @@ class item_defias_gunpowder : public ItemScript public: item_defias_gunpowder() : ItemScript("item_defias_gunpowder") { } - bool OnUse(Player* player, Item* item, SpellCastTargets const& targets) + bool OnUse(Player* player, Item* item, SpellCastTargets const& targets) OVERRIDE { InstanceScript* instance = player->GetInstanceScript(); diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp index 210fb11a269..b9073a35abf 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp @@ -200,7 +200,7 @@ class instance_deadmines : public InstanceMapScript } } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -216,7 +216,7 @@ class instance_deadmines : public InstanceMapScript } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -227,7 +227,7 @@ class instance_deadmines : public InstanceMapScript return 0; } - uint64 GetData64(uint32 data) const + uint64 GetData64(uint32 data) const OVERRIDE { switch (data) { @@ -246,7 +246,7 @@ class instance_deadmines : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_deadmines_InstanceMapScript(map); } diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp index f8fc6e7cfdf..46683442a60 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp @@ -88,12 +88,12 @@ class npc_blastmaster_emi_shortfuse : public CreatureScript public: npc_blastmaster_emi_shortfuse() : CreatureScript("npc_blastmaster_emi_shortfuse") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_blastmaster_emi_shortfuseAI(creature); } - 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) @@ -109,7 +109,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { InstanceScript* instance = creature->GetInstanceScript(); @@ -138,7 +138,7 @@ public: std::list<uint64> SummonList; std::list<uint64> GoSummonList; - void Reset() + void Reset() OVERRIDE { if (!HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -264,7 +264,7 @@ public: } } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { //just in case if (GetPlayerForEscort()) @@ -308,7 +308,7 @@ public: } } - void SetData(uint32 uiI, uint32 uiValue) + void SetData(uint32 uiI, uint32 uiValue) OVERRIDE { switch (uiI) { @@ -408,7 +408,7 @@ public: } } - void UpdateEscortAI(const uint32 uiDiff) + void UpdateEscortAI(const uint32 uiDiff) OVERRIDE { if (uiPhase) { @@ -537,7 +537,7 @@ public: DoMeleeAttackIfReady(); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { SummonList.push_back(summon->GetGUID()); AggroAllPlayers(summon); @@ -551,7 +551,7 @@ class boss_grubbis : public CreatureScript public: boss_grubbis() : CreatureScript("boss_grubbis") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_grubbisAI(creature); } @@ -573,7 +573,7 @@ public: creature->AI()->SetData(2, 1); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!UpdateVictim()) return; @@ -581,7 +581,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (!me->IsSummon()) return; diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp index de3606b7b55..a00e9d9abe5 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp @@ -27,7 +27,7 @@ class instance_gnomeregan : public InstanceMapScript public: instance_gnomeregan() : InstanceMapScript("instance_gnomeregan", 90) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_gnomeregan_InstanceMapScript(map); } @@ -102,7 +102,7 @@ public: } } - void SetData(uint32 uiType, uint32 uiData) + void SetData(uint32 uiType, uint32 uiData) OVERRIDE { switch (uiType) { @@ -114,7 +114,7 @@ public: } } - uint32 GetData(uint32 uiType) const + uint32 GetData(uint32 uiType) const OVERRIDE { switch (uiType) { @@ -123,7 +123,7 @@ public: return 0; } - uint64 GetData64(uint32 uiType) const + uint64 GetData64(uint32 uiType) const OVERRIDE { switch (uiType) { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp index 9dab7439136..e8e388039f8 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp @@ -53,7 +53,7 @@ class boss_curator : public CreatureScript public: boss_curator() : CreatureScript("boss_curator") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_curatorAI (creature); } @@ -69,7 +69,7 @@ public: bool Enraged; bool Evocating; - void Reset() + void Reset() OVERRIDE { AddTimer = 10000; HatefulBoltTimer = 15000; //This time may be wrong @@ -80,22 +80,22 @@ public: me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_ARCANE, true); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp index ff31074617c..a348a7026d1 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp @@ -45,7 +45,7 @@ class boss_maiden_of_virtue : public CreatureScript public: boss_maiden_of_virtue() : CreatureScript("boss_maiden_of_virtue") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_maiden_of_virtueAI (creature); } @@ -62,7 +62,7 @@ public: bool Enraged; - void Reset() + void Reset() OVERRIDE { Repentance_Timer = 25000+(rand()%15000); Holyfire_Timer = 8000+(rand()%17000); @@ -73,23 +73,23 @@ public: Enraged = false; } - void KilledUnit(Unit* /*Victim*/) + void KilledUnit(Unit* /*Victim*/) OVERRIDE { if (urand(0, 1) == 0) Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index be6eac01cc4..083af294e18 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -53,7 +53,7 @@ class boss_attumen : public CreatureScript public: boss_attumen() : CreatureScript("boss_attumen") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_attumenAI (creature); } @@ -79,34 +79,34 @@ public: uint32 ChargeTimer; //only when mounted uint32 ResetTimer; - void Reset() + void Reset() OVERRIDE { ResetTimer = 0; } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { ScriptedAI::EnterEvadeMode(); ResetTimer = 2000; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); if (Unit* midnight = Unit::GetUnit(*me, Midnight)) midnight->Kill(midnight); } - void UpdateAI(uint32 diff); + void UpdateAI(uint32 diff) OVERRIDE; - void SpellHit(Unit* /*source*/, const SpellInfo* spell) + void SpellHit(Unit* /*source*/, const SpellInfo* spell) OVERRIDE { if (spell->Mechanic == MECHANIC_DISARM) Talk(SAY_DISARMED); @@ -119,7 +119,7 @@ class boss_midnight : public CreatureScript public: boss_midnight() : CreatureScript("boss_midnight") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_midnightAI(creature); } @@ -132,7 +132,7 @@ public: uint8 Phase; uint32 Mount_Timer; - void Reset() + void Reset() OVERRIDE { Phase = 1; Attumen = 0; @@ -142,9 +142,9 @@ public: me->SetVisible(true); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { if (Phase == 2) { @@ -153,7 +153,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index 0cd7b6d6744..b8b3849f8c7 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -98,7 +98,7 @@ class boss_moroes : public CreatureScript public: boss_moroes() : CreatureScript("boss_moroes") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_moroesAI (creature); } @@ -127,7 +127,7 @@ public: bool InVanish; bool Enrage; - void Reset() + void Reset() OVERRIDE { Vanish_Timer = 30000; Blind_Timer = 35000; @@ -152,7 +152,7 @@ public: DoZoneInCombat(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { StartEvent(); @@ -161,12 +161,12 @@ public: DoZoneInCombat(); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -259,7 +259,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -355,7 +355,7 @@ struct boss_moroes_guestAI : public ScriptedAI instance = creature->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { if (instance) instance->SetData(TYPE_MOROES, NOT_STARTED); @@ -385,7 +385,7 @@ struct boss_moroes_guestAI : public ScriptedAI return me; } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (instance && !instance->GetData(TYPE_MOROES)) EnterEvadeMode(); @@ -399,7 +399,7 @@ class boss_baroness_dorothea_millstipe : public CreatureScript public: boss_baroness_dorothea_millstipe() : CreatureScript("boss_baroness_dorothea_millstipe") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_baroness_dorothea_millstipeAI (creature); } @@ -413,7 +413,7 @@ public: uint32 MindFlay_Timer; uint32 ShadowWordPain_Timer; - void Reset() + void Reset() OVERRIDE { ManaBurn_Timer = 7000; MindFlay_Timer = 1000; @@ -424,7 +424,7 @@ public: boss_moroes_guestAI::Reset(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -462,7 +462,7 @@ class boss_baron_rafe_dreuger : public CreatureScript public: boss_baron_rafe_dreuger() : CreatureScript("boss_baron_rafe_dreuger") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_baron_rafe_dreugerAI (creature); } @@ -476,7 +476,7 @@ public: uint32 SealOfCommand_Timer; uint32 JudgementOfCommand_Timer; - void Reset() + void Reset() OVERRIDE { HammerOfJustice_Timer = 1000; SealOfCommand_Timer = 7000; @@ -485,7 +485,7 @@ public: boss_moroes_guestAI::Reset(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -519,7 +519,7 @@ class boss_lady_catriona_von_indi : public CreatureScript public: boss_lady_catriona_von_indi() : CreatureScript("boss_lady_catriona_von_indi") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_lady_catriona_von_indiAI (creature); } @@ -534,7 +534,7 @@ public: uint32 HolyFire_Timer; uint32 PowerWordShield_Timer; - void Reset() + void Reset() OVERRIDE { DispelMagic_Timer = 11000; GreaterHeal_Timer = 1500; @@ -546,7 +546,7 @@ public: boss_moroes_guestAI::Reset(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -589,7 +589,7 @@ class boss_lady_keira_berrybuck : public CreatureScript public: boss_lady_keira_berrybuck() : CreatureScript("boss_lady_keira_berrybuck") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_lady_keira_berrybuckAI (creature); } @@ -604,7 +604,7 @@ public: uint32 HolyLight_Timer; uint32 DivineShield_Timer; - void Reset() + void Reset() OVERRIDE { Cleanse_Timer = 13000; GreaterBless_Timer = 1000; @@ -616,7 +616,7 @@ public: boss_moroes_guestAI::Reset(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -663,7 +663,7 @@ class boss_lord_robin_daris : public CreatureScript public: boss_lord_robin_daris() : CreatureScript("boss_lord_robin_daris") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_lord_robin_darisAI (creature); } @@ -677,7 +677,7 @@ public: uint32 MortalStrike_Timer; uint32 WhirlWind_Timer; - void Reset() + void Reset() OVERRIDE { Hamstring_Timer = 7000; MortalStrike_Timer = 10000; @@ -686,7 +686,7 @@ public: boss_moroes_guestAI::Reset(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -719,7 +719,7 @@ class boss_lord_crispin_ference : public CreatureScript public: boss_lord_crispin_ference() : CreatureScript("boss_lord_crispin_ference") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_lord_crispin_ferenceAI (creature); } @@ -734,7 +734,7 @@ public: uint32 ShieldBash_Timer; uint32 ShieldWall_Timer; - void Reset() + void Reset() OVERRIDE { Disarm_Timer = 6000; HeroicStrike_Timer = 10000; @@ -744,7 +744,7 @@ public: boss_moroes_guestAI::Reset(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index 66c6994f2b6..f80ff5b6028 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -69,7 +69,7 @@ class boss_netherspite : public CreatureScript public: boss_netherspite() : CreatureScript("boss_netherspite") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_netherspiteAI(creature); } @@ -127,7 +127,7 @@ public: return sqrt((xa-xb)*(xa-xb) + (ya-yb)*(ya-yb)); } - void Reset() + void Reset() OVERRIDE { Berserk = false; NetherInfusionTimer = 540000; @@ -257,19 +257,19 @@ public: Door->SetGoState(open ? GO_STATE_ACTIVE : GO_STATE_READY); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { HandleDoors(false); SwitchToPortalPhase(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { HandleDoors(true); DestroyPortals(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index cccf45d9c32..74593e5ef56 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -69,7 +69,7 @@ class boss_nightbane : public CreatureScript public: boss_nightbane() : CreatureScript("boss_nightbane") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_nightbaneAI (creature); } @@ -109,7 +109,7 @@ public: uint32 WaitTimer; uint32 MovePhase; - void Reset() + void Reset() OVERRIDE { BellowingRoarTimer = 30000; CharredEarthTimer = 15000; @@ -160,7 +160,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) instance->SetData(TYPE_NIGHTBANE, IN_PROGRESS); @@ -169,13 +169,13 @@ public: Talk(YELL_AGGRO); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!Intro && !Flying) ScriptedAI::AttackStart(who); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(TYPE_NIGHTBANE, DONE); @@ -183,13 +183,14 @@ public: HandleTerraceDoors(true); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!Intro && !Flying) ScriptedAI::MoveInLineOfSight(who); } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -235,7 +236,7 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me->GetVictim()); } @@ -260,7 +261,7 @@ public: Skeletons = false; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { /* The timer for this was never setup apparently, not sure if the code works properly: if (WaitTimer <= diff) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index bb9f36f36c9..58acf95b1ed 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -102,7 +102,7 @@ class netherspite_infernal : public CreatureScript public: netherspite_infernal() : CreatureScript("netherspite_infernal") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new netherspite_infernalAI (creature); } @@ -117,11 +117,12 @@ public: uint64 malchezaar; InfernalPoint *point; - void Reset() {} - void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} + void Reset() OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + + void UpdateAI(uint32 diff) OVERRIDE { if (HellfireTimer) { @@ -143,14 +144,14 @@ public: } } - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (Unit* unit = Unit::GetUnit(*me, malchezaar)) if (Creature* creature = unit->ToCreature()) creature->AI()->KilledUnit(who); } - void SpellHit(Unit* /*who*/, const SpellInfo* spell) + void SpellHit(Unit* /*who*/, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_INFERNAL_RELAY) { @@ -161,7 +162,7 @@ public: } } - void DamageTaken(Unit* done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE { if (done_by->GetGUID() != malchezaar) damage = 0; @@ -176,7 +177,7 @@ class boss_malchezaar : public CreatureScript public: boss_malchezaar() : CreatureScript("boss_malchezaar") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_malchezaarAI (creature); } @@ -210,7 +211,7 @@ public: uint32 phase; - void Reset() + void Reset() OVERRIDE { AxesCleanup(); ClearWeapons(); @@ -242,12 +243,12 @@ public: instance->HandleGameObject(instance->GetData64(DATA_GO_NETHER_DOOR), true); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -263,7 +264,7 @@ public: instance->HandleGameObject(instance->GetData64(DATA_GO_NETHER_DOOR), true); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -386,7 +387,7 @@ public: Talk(SAY_SUMMON); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp index c4cded87665..bf3586cd4df 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -84,7 +84,7 @@ class boss_shade_of_aran : public CreatureScript public: boss_shade_of_aran() : CreatureScript("boss_shade_of_aran") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_aranAI (creature); } @@ -123,7 +123,7 @@ public: bool Drinking; bool DrinkInturrupted; - void Reset() + void Reset() OVERRIDE { SecondarySpellTimer = 5000; NormalCastTimer = 0; @@ -155,12 +155,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); @@ -171,7 +171,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -217,7 +217,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -478,13 +478,13 @@ public: DoMeleeAttackIfReady(); } - void DamageTaken(Unit* /*pAttacker*/, uint32 &damage) + void DamageTaken(Unit* /*pAttacker*/, uint32 &damage) OVERRIDE { if (!DrinkInturrupted && Drinking && damage) DrinkInturrupted = true; } - void SpellHit(Unit* /*pAttacker*/, const SpellInfo* Spell) + void SpellHit(Unit* /*pAttacker*/, const SpellInfo* Spell) OVERRIDE { //We only care about interrupt effects and only if they are durring a spell currently being casted if ((Spell->Effects[0].Effect != SPELL_EFFECT_INTERRUPT_CAST && @@ -513,7 +513,7 @@ class npc_aran_elemental : public CreatureScript public: npc_aran_elemental() : CreatureScript("npc_aran_elemental") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new water_elementalAI (creature); } @@ -524,14 +524,14 @@ public: uint32 CastTimer; - void Reset() + void Reset() OVERRIDE { CastTimer = 2000 + (rand()%3000); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp index b7f51d68ae5..3264397d563 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp @@ -70,7 +70,7 @@ class npc_kilrek : public CreatureScript public: npc_kilrek() : CreatureScript("npc_kilrek") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_kilrekAI (creature); } @@ -88,13 +88,13 @@ public: uint32 AmplifyTimer; - void Reset() + void Reset() OVERRIDE { TerestianGUID = 0; AmplifyTimer = 2000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (!instance) { @@ -103,7 +103,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -117,7 +117,7 @@ public: } else ERROR_INST_DATA(me); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -141,7 +141,7 @@ class npc_demon_chain : public CreatureScript public: npc_demon_chain() : CreatureScript("npc_demon_chain") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_demon_chainAI(creature); } @@ -152,16 +152,17 @@ public: uint64 SacrificeGUID; - void Reset() + void Reset() OVERRIDE { SacrificeGUID = 0; } - void EnterCombat(Unit* /*who*/) {} - void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void AttackStart(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void JustDied(Unit* /*killer*/) + + void JustDied(Unit* /*killer*/) OVERRIDE { if (SacrificeGUID) { @@ -178,7 +179,7 @@ class npc_fiendish_portal : public CreatureScript public: npc_fiendish_portal() : CreatureScript("npc_fiendish_portal") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_fiendish_portalAI (creature); } @@ -189,12 +190,12 @@ public: SummonList summons; - void Reset() + void Reset() OVERRIDE { DespawnAllImp(); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { summons.Summon(summon); DoZoneInCombat(summon); @@ -212,7 +213,7 @@ class npc_fiendish_imp : public CreatureScript public: npc_fiendish_imp() : CreatureScript("npc_fiendish_imp") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_fiendish_impAI (creature); } @@ -223,16 +224,16 @@ public: uint32 FireboltTimer; - void Reset() + void Reset() OVERRIDE { FireboltTimer = 2000; me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -254,7 +255,7 @@ class boss_terestian_illhoof : public CreatureScript public: boss_terestian_illhoof() : CreatureScript("boss_terestian_illhoof") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_terestianAI (creature); } @@ -281,7 +282,7 @@ public: bool SummonedPortals; bool Berserk; - void Reset() + void Reset() OVERRIDE { for (uint8 i = 0; i < 2; ++i) { @@ -322,12 +323,12 @@ public: else DoCast(me, SPELL_SUMMON_IMP, true); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned->GetEntry() == NPC_PORTAL) { @@ -342,12 +343,12 @@ public: } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { for (uint8 i = 0; i < 2; ++i) { @@ -366,7 +367,7 @@ public: instance->SetData(TYPE_TERESTIAN, DONE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index 17546c66e26..29ae4890fdc 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -116,7 +116,7 @@ class boss_dorothee : public CreatureScript public: boss_dorothee() : CreatureScript("boss_dorothee") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_dorotheeAI(creature); } @@ -139,7 +139,7 @@ public: bool SummonedTito; bool TitoDied; - void Reset() + void Reset() OVERRIDE { AggroTimer = 500; @@ -151,19 +151,19 @@ public: TitoDied = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_DOROTHEE_AGGRO); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { me->DespawnOrUnsummon(); } void SummonTito(); - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DOROTHEE_DEATH); @@ -171,7 +171,7 @@ public: SummonCroneIfReady(instance, me); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -179,7 +179,8 @@ public: ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -187,7 +188,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (AggroTimer) { @@ -230,7 +231,7 @@ class npc_tito : public CreatureScript public: npc_tito() : CreatureScript("npc_tito") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_titoAI(creature); } @@ -242,15 +243,15 @@ public: uint64 DorotheeGUID; uint32 YipTimer; - void Reset() + void Reset() OVERRIDE { DorotheeGUID = 0; YipTimer = 10000; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (DorotheeGUID) { @@ -263,7 +264,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -296,7 +297,7 @@ class boss_strawman : public CreatureScript public: boss_strawman() : CreatureScript("boss_strawman") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_strawmanAI(creature); } @@ -314,14 +315,14 @@ public: uint32 BrainBashTimer; uint32 BrainWipeTimer; - void Reset() + void Reset() OVERRIDE { AggroTimer = 13000; BrainBashTimer = 5000; BrainWipeTimer = 7000; } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -329,7 +330,8 @@ public: ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -337,17 +339,17 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_STRAWMAN_AGGRO); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { me->DespawnOrUnsummon(); } - void SpellHit(Unit* /*caster*/, const SpellInfo* Spell) + void SpellHit(Unit* /*caster*/, const SpellInfo* Spell) OVERRIDE { if ((Spell->SchoolMask == SPELL_SCHOOL_MASK_FIRE) && (!(rand()%10))) { @@ -360,7 +362,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_STRAWMAN_DEATH); @@ -368,12 +370,12 @@ public: SummonCroneIfReady(instance, me); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_STRAWMAN_SLAY); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (AggroTimer) { @@ -410,7 +412,7 @@ class boss_tinhead : public CreatureScript public: boss_tinhead() : CreatureScript("boss_tinhead") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_tinheadAI(creature); } @@ -430,7 +432,7 @@ public: uint8 RustCount; - void Reset() + void Reset() OVERRIDE { AggroTimer = 15000; CleaveTimer = 5000; @@ -439,17 +441,17 @@ public: RustCount = 0; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_TINHEAD_AGGRO); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { me->DespawnOrUnsummon(); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -457,7 +459,8 @@ public: ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -465,7 +468,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_TINHEAD_DEATH); @@ -473,12 +476,12 @@ public: SummonCroneIfReady(instance, me); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_TINHEAD_SLAY); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (AggroTimer) { @@ -519,7 +522,7 @@ class boss_roar : public CreatureScript public: boss_roar() : CreatureScript("boss_roar") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_roarAI(creature); } @@ -538,7 +541,7 @@ public: uint32 ShredTimer; uint32 ScreamTimer; - void Reset() + void Reset() OVERRIDE { AggroTimer = 20000; MangleTimer = 5000; @@ -546,7 +549,8 @@ public: ScreamTimer = 15000; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -554,7 +558,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -562,17 +566,17 @@ public: ScriptedAI::AttackStart(who); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_ROAR_AGGRO); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { me->DespawnOrUnsummon(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_ROAR_DEATH); @@ -580,12 +584,12 @@ public: SummonCroneIfReady(instance, me); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_ROAR_SLAY); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (AggroTimer) { @@ -627,7 +631,7 @@ class boss_crone : public CreatureScript public: boss_crone() : CreatureScript("boss_crone") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_croneAI(creature); } @@ -644,30 +648,30 @@ public: uint32 CycloneTimer; uint32 ChainLightningTimer; - void Reset() + void Reset() OVERRIDE { CycloneTimer = 30000; ChainLightningTimer = 10000; } - void JustReachedHome() + void JustReachedHome() OVERRIDE { me->DespawnOrUnsummon(); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_CRONE_SLAY); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_CRONE_AGGRO); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_CRONE_DEATH); @@ -682,7 +686,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -713,7 +717,7 @@ class npc_cyclone : public CreatureScript public: npc_cyclone() : CreatureScript("npc_cyclone") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_cycloneAI(creature); } @@ -724,18 +728,19 @@ public: uint32 MoveTimer; - void Reset() + void Reset() OVERRIDE { MoveTimer = 1000; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE - void MoveInLineOfSight(Unit* /*who*/) { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!me->HasAura(SPELL_KNOCKBACK)) DoCast(me, SPELL_KNOCKBACK, true); @@ -778,7 +783,7 @@ class npc_grandmother : public CreatureScript public: npc_grandmother() : CreatureScript("npc_grandmother") { } - 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) @@ -792,7 +797,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_GRANDMA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); player->SEND_GOSSIP_MENU(8990, creature->GetGUID()); @@ -806,7 +811,7 @@ class boss_bigbadwolf : public CreatureScript public: boss_bigbadwolf() : CreatureScript("boss_bigbadwolf") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_bigbadwolfAI(creature); } @@ -829,7 +834,7 @@ public: bool IsChasing; - void Reset() + void Reset() OVERRIDE { ChaseTimer = 30000; FearTimer = urand(25000, 35000); @@ -841,22 +846,22 @@ public: IsChasing = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_WOLF_AGGRO); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_WOLF_SLAY); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { me->DespawnOrUnsummon(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { DoPlaySoundToSet(me, SOUND_WOLF_DEATH); @@ -871,7 +876,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1008,7 +1013,7 @@ class boss_julianne : public CreatureScript public: boss_julianne() : CreatureScript("boss_julianne") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_julianneAI(creature); } @@ -1045,7 +1050,7 @@ public: bool SummonedRomulo; bool RomuloDead; - void Reset() + void Reset() OVERRIDE { RomuloGUID = 0; Phase = PHASE_JULIANNE; @@ -1068,9 +1073,9 @@ public: RomuloDead = false; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1078,7 +1083,8 @@ public: ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1086,12 +1092,12 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { me->DespawnOrUnsummon(); } - void SpellHit(Unit* /*caster*/, const SpellInfo* Spell) + void SpellHit(Unit* /*caster*/, const SpellInfo* Spell) OVERRIDE { if (Spell->Id == SPELL_DRINK_POISON) { @@ -1100,9 +1106,9 @@ public: } } - void DamageTaken(Unit* /*done_by*/, uint32 &damage); + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE; - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_JULIANNE_DEATH02); @@ -1116,12 +1122,12 @@ public: } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_JULIANNE_SLAY); } - void UpdateAI(uint32 diff); + void UpdateAI(uint32 diff) OVERRIDE; }; }; @@ -1130,7 +1136,7 @@ class boss_romulo : public CreatureScript public: boss_romulo() : CreatureScript("boss_romulo") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_romuloAI(creature); } @@ -1160,7 +1166,7 @@ public: bool IsFakingDeath; bool JulianneDead; - void Reset() + void Reset() OVERRIDE { JulianneGUID = 0; Phase = PHASE_ROMULO; @@ -1175,12 +1181,12 @@ public: JulianneDead = false; } - void JustReachedHome() + void JustReachedHome() OVERRIDE { me->DespawnOrUnsummon(); } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { if (damage < me->GetHealth()) return; @@ -1234,7 +1240,7 @@ public: TC_LOG_ERROR(LOG_FILTER_TSCR, "boss_romuloAI: DamageTaken reach end of code, that should not happen."); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_ROMULO_AGGRO); if (JulianneGUID) @@ -1248,7 +1254,8 @@ public: } } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1256,7 +1263,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_ROMULO_DEATH); @@ -1271,12 +1278,12 @@ public: } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_ROMULO_SLAY); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || IsFakingDeath) return; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp index 412fcae76b1..eef61f0c051 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp @@ -49,7 +49,7 @@ class instance_karazhan : public InstanceMapScript public: instance_karazhan() : InstanceMapScript("instance_karazhan", 532) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_karazhan_InstanceMapScript(map); } @@ -127,7 +127,7 @@ public: } } - void SetData(uint32 type, uint32 uiData) + void SetData(uint32 type, uint32 uiData) OVERRIDE { switch (type) { @@ -182,7 +182,7 @@ public: } } - void SetData64(uint32 identifier, uint64 data) + void SetData64(uint32 identifier, uint64 data) OVERRIDE { switch (identifier) { @@ -241,7 +241,7 @@ public: return strSaveData; } - uint32 GetData(uint32 uiData) const + uint32 GetData(uint32 uiData) const OVERRIDE { switch (uiData) { @@ -264,7 +264,7 @@ public: return 0; } - uint64 GetData64(uint32 uiData) const + uint64 GetData64(uint32 uiData) const OVERRIDE { switch (uiData) { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index 14cb7e69d83..679f52343eb 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -148,7 +148,7 @@ public: bool PerformanceReady; bool RaidWiped; - void Reset() + void Reset() OVERRIDE { m_uiSpotlightGUID = 0; @@ -176,9 +176,9 @@ public: Start(false, false); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (!instance) return; @@ -283,7 +283,7 @@ public: RaidWiped = false; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { npc_escortAI::UpdateAI(diff); @@ -343,7 +343,7 @@ public: } }; - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); npc_barnesAI* pBarnesAI = CAST_AI(npc_barnes::npc_barnesAI, creature->AI()); @@ -378,7 +378,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (InstanceScript* instance = creature->GetInstanceScript()) { @@ -410,7 +410,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_barnesAI(creature); } @@ -427,7 +427,7 @@ class npc_berthold : public CreatureScript public: npc_berthold() : CreatureScript("npc_berthold") { } - 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) @@ -437,7 +437,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (InstanceScript* instance = creature->GetInstanceScript()) { @@ -474,7 +474,7 @@ class npc_image_of_medivh : public CreatureScript public: npc_image_of_medivh() : CreatureScript("npc_image_of_medivh") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_image_of_medivhAI(creature); } @@ -497,7 +497,7 @@ public: bool EventStarted; - void Reset() + void Reset() OVERRIDE { ArcanagosGUID = 0; @@ -512,9 +512,9 @@ public: me->RemoveCorpse(); } } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -620,7 +620,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (YellTimer <= diff) { diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 619bc4e921c..74d65480611 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -94,7 +94,7 @@ class boss_felblood_kaelthas : public CreatureScript public: boss_felblood_kaelthas() : CreatureScript("boss_felblood_kaelthas") { } - CreatureAI* GetAI(Creature* c) const + CreatureAI* GetAI(Creature* c) const OVERRIDE { return new boss_felblood_kaelthasAI(c); } @@ -132,7 +132,7 @@ public: // 1 = Fireball; Summon Phoenix; Flamestrike // 2 = Gravity Lapses - void Reset() + void Reset() OVERRIDE { /// @todo Timers FireballTimer = 0; @@ -154,7 +154,7 @@ public: instance->SetData(DATA_KAELTHAS_EVENT, NOT_STARTED); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -168,13 +168,13 @@ public: escapeOrb->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { if (damage > me->GetHealth()) RemoveGravityLapse(); // Remove Gravity Lapse so that players fall to ground if they kill him when in air. } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (!instance) return; @@ -182,7 +182,8 @@ public: instance->SetData(DATA_KAELTHAS_EVENT, IN_PROGRESS); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!HasTaunted && me->IsWithinDistInMap(who, 40.0f)) { @@ -280,7 +281,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -437,7 +438,7 @@ class npc_felkael_flamestrike : public CreatureScript public: npc_felkael_flamestrike() : CreatureScript("npc_felkael_flamestrike") { } - CreatureAI* GetAI(Creature* c) const + CreatureAI* GetAI(Creature* c) const OVERRIDE { return new npc_felkael_flamestrikeAI(c); } @@ -450,7 +451,7 @@ public: uint32 FlameStrikeTimer; - void Reset() + void Reset() OVERRIDE { FlameStrikeTimer = 5000; @@ -460,9 +461,10 @@ public: DoCast(me, SPELL_FLAMESTRIKE2, true); } - void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(uint32 diff) + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + + void UpdateAI(uint32 diff) OVERRIDE { if (FlameStrikeTimer <= diff) { @@ -478,7 +480,7 @@ class npc_felkael_phoenix : public CreatureScript public: npc_felkael_phoenix() : CreatureScript("npc_felkael_phoenix") { } - CreatureAI* GetAI(Creature* c) const + CreatureAI* GetAI(Creature* c) const OVERRIDE { return new npc_felkael_phoenixAI(c); } @@ -496,7 +498,7 @@ public: bool Rebirth; bool FakeDeath; - void Reset() + void Reset() OVERRIDE { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE + UNIT_FLAG_NON_ATTACKABLE); me->SetDisableGravity(true); @@ -507,9 +509,9 @@ public: FakeDeath = false; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void DamageTaken(Unit* /*killer*/, uint32 &damage) + void DamageTaken(Unit* /*killer*/, uint32 &damage) OVERRIDE { if (damage < me->GetHealth()) return; @@ -543,12 +545,12 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { me->SummonCreature(CREATURE_PHOENIX_EGG, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 45000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //If we are fake death, we cast revbirth and after that we kill the phoenix to spawn the egg. if (FakeDeath) @@ -591,7 +593,7 @@ class npc_felkael_phoenix_egg : public CreatureScript public: npc_felkael_phoenix_egg() : CreatureScript("npc_felkael_phoenix_egg") { } - CreatureAI* GetAI(Creature* c) const + CreatureAI* GetAI(Creature* c) const OVERRIDE { return new npc_felkael_phoenix_eggAI(c); } @@ -602,15 +604,16 @@ public: uint32 HatchTimer; - void Reset() + void Reset() OVERRIDE { HatchTimer = 10000; } - void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (HatchTimer <= diff) { @@ -626,7 +629,7 @@ class npc_arcane_sphere : public CreatureScript public: npc_arcane_sphere() : CreatureScript("npc_arcane_sphere") { } - CreatureAI* GetAI(Creature* c) const + CreatureAI* GetAI(Creature* c) const OVERRIDE { return new npc_arcane_sphereAI(c); } @@ -638,7 +641,7 @@ public: uint32 DespawnTimer; uint32 ChangeTargetTimer; - void Reset() + void Reset() OVERRIDE { DespawnTimer = 30000; ChangeTargetTimer = urand(6000, 12000); @@ -649,9 +652,9 @@ public: DoCast(me, SPELL_ARCANE_SPHERE_PASSIVE, true); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (DespawnTimer <= diff) me->Kill(me); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index 7c5d36d662b..506cd3f292b 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -108,7 +108,7 @@ class boss_priestess_delrissa : public CreatureScript public: boss_priestess_delrissa() : CreatureScript("boss_priestess_delrissa") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_priestess_delrissaAI(creature); } @@ -136,7 +136,7 @@ public: uint32 DispelTimer; uint32 ResetTimer; - void Reset() + void Reset() OVERRIDE { PlayersKilled = 0; @@ -151,13 +151,13 @@ public: } //this mean she at some point evaded - void JustReachedHome() + void JustReachedHome() OVERRIDE { if (instance) instance->SetData(DATA_DELRISSA_EVENT, FAIL); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { Talk(SAY_AGGRO); @@ -226,7 +226,7 @@ public: } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -237,7 +237,7 @@ public: ++PlayersKilled; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -253,7 +253,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -370,7 +370,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI bool UsedPotion; - void Reset() + void Reset() OVERRIDE { UsedPotion = false; @@ -388,7 +388,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (!who) return; @@ -418,7 +418,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (!instance) return; @@ -450,7 +450,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (!instance) return; @@ -471,7 +471,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UsedPotion && HealthBelowPct(25)) { @@ -502,7 +502,7 @@ class boss_kagani_nightstrike : public CreatureScript public: boss_kagani_nightstrike() : CreatureScript("boss_kagani_nightstrike") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_kagani_nightstrikeAI(creature); } @@ -519,7 +519,7 @@ public: uint32 Wait_Timer; bool InVanish; - void Reset() + void Reset() OVERRIDE { Gouge_Timer = 5500; Kick_Timer = 7000; @@ -532,7 +532,7 @@ public: boss_priestess_lackey_commonAI::Reset(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -606,7 +606,7 @@ class boss_ellris_duskhallow : public CreatureScript public: boss_ellris_duskhallow() : CreatureScript("boss_ellris_duskhallow") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_ellris_duskhallowAI(creature); } @@ -622,7 +622,7 @@ public: uint32 Curse_of_Agony_Timer; uint32 Fear_Timer; - void Reset() + void Reset() OVERRIDE { Immolate_Timer = 6000; Shadow_Bolt_Timer = 3000; @@ -633,12 +633,12 @@ public: boss_priestess_lackey_commonAI::Reset(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoCast(me, SPELL_SUMMON_IMP); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -697,7 +697,7 @@ class boss_eramas_brightblaze : public CreatureScript public: boss_eramas_brightblaze() : CreatureScript("boss_eramas_brightblaze") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_eramas_brightblazeAI(creature); } @@ -710,7 +710,7 @@ public: uint32 Knockdown_Timer; uint32 Snap_Kick_Timer; - void Reset() + void Reset() OVERRIDE { Knockdown_Timer = 6000; Snap_Kick_Timer = 4500; @@ -718,7 +718,7 @@ public: boss_priestess_lackey_commonAI::Reset(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -758,7 +758,7 @@ class boss_yazzai : public CreatureScript public: boss_yazzai() : CreatureScript("boss_yazzai") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_yazzaiAI(creature); } @@ -779,7 +779,7 @@ public: uint32 Frostbolt_Timer; uint32 Blink_Timer; - void Reset() + void Reset() OVERRIDE { HasIceBlocked = false; @@ -795,7 +795,7 @@ public: boss_priestess_lackey_commonAI::Reset(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -888,7 +888,7 @@ class boss_warlord_salaris : public CreatureScript public: boss_warlord_salaris() : CreatureScript("boss_warlord_salaris") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_warlord_salarisAI(creature); } @@ -905,7 +905,7 @@ public: uint32 Hamstring_Timer; uint32 Mortal_Strike_Timer; - void Reset() + void Reset() OVERRIDE { Intercept_Stun_Timer = 500; Disarm_Timer = 6000; @@ -917,12 +917,12 @@ public: boss_priestess_lackey_commonAI::Reset(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoCast(me, SPELL_BATTLE_SHOUT); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1008,7 +1008,7 @@ class boss_garaxxas : public CreatureScript public: boss_garaxxas() : CreatureScript("boss_garaxxas") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_garaxxasAI(creature); } @@ -1030,7 +1030,7 @@ public: uint32 Wing_Clip_Timer; uint32 Freezing_Trap_Timer; - void Reset() + void Reset() OVERRIDE { Aimed_Shot_Timer = 6000; Shoot_Timer = 2500; @@ -1046,12 +1046,12 @@ public: boss_priestess_lackey_commonAI::Reset(); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { m_uiPetGUID = summoned->GetGUID(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1119,7 +1119,7 @@ class boss_apoko : public CreatureScript public: boss_apoko() : CreatureScript("boss_apoko") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_apokoAI(creature); } @@ -1136,7 +1136,7 @@ public: uint32 Healing_Wave_Timer; uint32 Frost_Shock_Timer; - void Reset() + void Reset() OVERRIDE { Totem_Timer = 2000; Totem_Amount = 1; @@ -1148,7 +1148,7 @@ public: boss_priestess_lackey_commonAI::Reset(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1217,7 +1217,7 @@ class boss_zelfan : public CreatureScript public: boss_zelfan() : CreatureScript("boss_zelfan") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_zelfanAI(creature); } @@ -1233,7 +1233,7 @@ public: uint32 High_Explosive_Sheep_Timer; uint32 Fel_Iron_Bomb_Timer; - void Reset() + void Reset() OVERRIDE { Goblin_Dragon_Gun_Timer = 20000; Rocket_Launch_Timer = 7000; @@ -1244,7 +1244,7 @@ public: boss_priestess_lackey_commonAI::Reset(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1302,7 +1302,7 @@ class npc_high_explosive_sheep : public CreatureScript public: npc_high_explosive_sheep() : CreatureScript("npc_high_explosive_sheep") { } - //CreatureAI* GetAI(Creature* creature) const + //CreatureAI* GetAI(Creature* creature) const OVERRIDE //{ // return new npc_high_explosive_sheepAI (creature); //}; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index 969a9abcbbf..7f77b8aaad0 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -64,7 +64,7 @@ class boss_selin_fireheart : public CreatureScript public: boss_selin_fireheart() : CreatureScript("boss_selin_fireheart") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_selin_fireheartAI (creature); }; @@ -105,7 +105,7 @@ public: uint64 CrystalGUID; // This will help us create a pointer to the crystal we are draining. We store GUIDs, never units in case unit is deleted/offline (offline if player of course). - void Reset() + void Reset() OVERRIDE { if (instance) { @@ -197,19 +197,19 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_SELIN_EVENT, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type == POINT_MOTION_TYPE && id == 1) { @@ -231,7 +231,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -242,7 +242,7 @@ public: ShatterRemainingCrystals(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -325,7 +325,7 @@ class npc_fel_crystal : public CreatureScript public: npc_fel_crystal() : CreatureScript("npc_fel_crystal") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_fel_crystalAI (creature); }; @@ -334,13 +334,14 @@ public: { npc_fel_crystalAI(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 JustDied(Unit* /*killer*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE {} + + void JustDied(Unit* /*killer*/) OVERRIDE { if (InstanceScript* instance = me->GetInstanceScript()) { diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index 22d127f3d22..a8c4e4ceaf1 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -74,7 +74,7 @@ class boss_vexallus : public CreatureScript public: boss_vexallus() : CreatureScript("boss_vexallus") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_vexallusAI (creature); }; @@ -94,7 +94,7 @@ public: uint32 IntervalHealthAmount; bool Enraged; - void Reset() + void Reset() OVERRIDE { summons.DespawnAll(); ChainLightningTimer = 8000; @@ -107,19 +107,19 @@ public: instance->SetData(DATA_VEXALLUS_EVENT, NOT_STARTED); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { summons.DespawnAll(); if (instance) instance->SetData(DATA_VEXALLUS_EVENT, DONE); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -127,7 +127,7 @@ public: instance->SetData(DATA_VEXALLUS_EVENT, IN_PROGRESS); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (Unit* temp = SelectTarget(SELECT_TARGET_RANDOM, 0)) summoned->GetMotionMaster()->MoveFollow(temp, 0, 0); @@ -136,7 +136,7 @@ public: summoned->CastSpell(summoned, SPELL_ENERGY_BOLT, false, 0, 0, me->GetGUID()); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -210,7 +210,7 @@ class npc_pure_energy : public CreatureScript public: npc_pure_energy() : CreatureScript("npc_pure_energy") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_pure_energyAI (creature); }; @@ -222,9 +222,9 @@ public: me->SetDisplayId(me->GetCreatureTemplate()->Modelid2); } - void Reset() {} + void Reset() OVERRIDE {} - void JustDied(Unit* slayer) + void JustDied(Unit* slayer) OVERRIDE { if (Unit* temp = me->GetOwner()) { @@ -233,9 +233,10 @@ public: } } - void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} - void AttackStart(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + + void AttackStart(Unit* /*who*/) OVERRIDE {} }; }; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp index ca06c29c4c8..6fcc050a55e 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp @@ -68,7 +68,7 @@ class npc_kalecgos : public CreatureScript public: npc_kalecgos() : CreatureScript("npc_kalecgos") { } - 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) @@ -97,7 +97,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -108,7 +108,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_kalecgosAI(creature); } @@ -119,7 +119,7 @@ public: uint32 m_uiTransformTimer; - void Reset() + void Reset() OVERRIDE { m_uiTransformTimer = 0; @@ -128,7 +128,7 @@ public: me->GetMotionMaster()->MovePoint(POINT_ID_LAND, afKaelLandPoint[0], afKaelLandPoint[1], afKaelLandPoint[2]); } - void MovementInform(uint32 uiType, uint32 uiPointId) + void MovementInform(uint32 uiType, uint32 uiPointId) OVERRIDE { if (uiType != POINT_MOTION_TYPE) return; @@ -162,7 +162,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (m_uiTransformTimer) { diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp index 645322768e3..ea28e548b39 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp @@ -59,7 +59,7 @@ class boss_baron_geddon : public CreatureScript { } - void EnterCombat(Unit* victim) + void EnterCombat(Unit* victim) OVERRIDE { BossAI::EnterCombat(victim); events.ScheduleEvent(EVENT_INFERNO, 45000); @@ -67,7 +67,7 @@ class boss_baron_geddon : public CreatureScript events.ScheduleEvent(EVENT_LIVING_BOMB, 35000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -113,7 +113,7 @@ class boss_baron_geddon : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_baron_geddonAI (creature); } diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp index 562af075b98..5eabc11618b 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp @@ -57,14 +57,14 @@ class boss_garr : public CreatureScript { } - void EnterCombat(Unit* victim) + void EnterCombat(Unit* victim) OVERRIDE { BossAI::EnterCombat(victim); events.ScheduleEvent(EVENT_ANTIMAGIC_PULSE, 25000); events.ScheduleEvent(EVENT_MAGMA_SHACKLES, 15000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -95,7 +95,7 @@ class boss_garr : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_garrAI(creature); } @@ -112,12 +112,12 @@ class npc_firesworn : public CreatureScript uint32 immolateTimer; - void Reset() + void Reset() OVERRIDE { immolateTimer = 4000; //These times are probably wrong } - void DamageTaken(Unit* /*attacker*/, uint32& damage) + void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE { uint32 const health10pct = me->CountPctFromMaxHealth(10); uint32 health = me->GetHealth(); @@ -129,7 +129,7 @@ class npc_firesworn : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -147,7 +147,7 @@ class npc_firesworn : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_fireswornAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp index 9007d16d2f9..15079953a34 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp @@ -53,7 +53,7 @@ class boss_gehennas : public CreatureScript { } - void EnterCombat(Unit* victim) + void EnterCombat(Unit* victim) OVERRIDE { BossAI::EnterCombat(victim); events.ScheduleEvent(EVENT_GEHENNAS_CURSE, 12000); @@ -61,7 +61,7 @@ class boss_gehennas : public CreatureScript events.ScheduleEvent(EVENT_SHADOW_BOLT, 6000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -98,7 +98,7 @@ class boss_gehennas : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_gehennasAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp index 7e798aa815e..0fdb88923b3 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp @@ -63,19 +63,19 @@ class boss_golemagg : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { BossAI::Reset(); DoCast(me, SPELL_MAGMASPLASH, true); } - void EnterCombat(Unit* victim) + void EnterCombat(Unit* victim) OVERRIDE { BossAI::EnterCombat(victim); events.ScheduleEvent(EVENT_PYROBLAST, 7000); } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE { if (!HealthBelowPct(10) || me->HasAura(SPELL_ENRAGE)) return; @@ -84,7 +84,7 @@ class boss_golemagg : public CreatureScript events.ScheduleEvent(EVENT_EARTHQUAKE, 3000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -116,7 +116,7 @@ class boss_golemagg : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_golemaggAI(creature); } @@ -134,12 +134,12 @@ class npc_core_rager : public CreatureScript instance = creature->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { mangleTimer = 7*IN_MILLISECONDS; // These times are probably wrong } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE { if (HealthAbovePct(50) || !instance) return; @@ -155,7 +155,7 @@ class npc_core_rager : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -177,7 +177,7 @@ class npc_core_rager : public CreatureScript uint32 mangleTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_core_ragerAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp index cb91cfc3cae..31f4e40552f 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_lucifron.cpp @@ -53,7 +53,7 @@ class boss_lucifron : public CreatureScript { } - void EnterCombat(Unit* victim) + void EnterCombat(Unit* victim) OVERRIDE { BossAI::EnterCombat(victim); events.ScheduleEvent(EVENT_IMPENDING_DOOM, 10000); @@ -61,7 +61,7 @@ class boss_lucifron : public CreatureScript events.ScheduleEvent(EVENT_SHADOW_SHOCK, 6000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -96,7 +96,7 @@ class boss_lucifron : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_lucifronAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp index c4b338d635d..7d40b9630ae 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp @@ -59,13 +59,13 @@ class boss_magmadar : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { BossAI::Reset(); DoCast(me, SPELL_MAGMA_SPIT, true); } - void EnterCombat(Unit* victim) + void EnterCombat(Unit* victim) OVERRIDE { BossAI::EnterCombat(victim); events.ScheduleEvent(EVENT_FRENZY, 30000); @@ -73,7 +73,7 @@ class boss_magmadar : public CreatureScript events.ScheduleEvent(EVENT_LAVA_BOMB, 12000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -110,7 +110,7 @@ class boss_magmadar : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_magmadarAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp index a221e2829dd..1001516d42e 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp @@ -78,13 +78,13 @@ class boss_majordomo : public CreatureScript { } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { if (urand(0, 99) < 25) Talk(SAY_SLAY); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { BossAI::EnterCombat(who); Talk(SAY_AGGRO); @@ -94,7 +94,7 @@ class boss_majordomo : public CreatureScript events.ScheduleEvent(EVENT_TELEPORT, 20000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (instance && instance->GetBossState(BOSS_MAJORDOMO_EXECUTUS) != DONE) { @@ -174,7 +174,7 @@ class boss_majordomo : public CreatureScript } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_START_RAGNAROS) { @@ -191,21 +191,21 @@ class boss_majordomo : public CreatureScript } }; - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->SEND_GOSSIP_MENU(GOSSIP_HELLO, creature->GetGUID()); 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(); creature->AI()->DoAction(ACTION_START_RAGNAROS); return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_majordomoAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp index c67272ac068..d03f756f366 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp @@ -87,7 +87,7 @@ class boss_ragnaros : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void Reset() + void Reset() OVERRIDE { BossAI::Reset(); _emergeTimer = 90000; @@ -97,7 +97,7 @@ class boss_ragnaros : public CreatureScript me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0); } - void EnterCombat(Unit* victim) + void EnterCombat(Unit* victim) OVERRIDE { BossAI::EnterCombat(victim); events.ScheduleEvent(EVENT_ERUPTION, 15000); @@ -109,13 +109,13 @@ class boss_ragnaros : public CreatureScript events.ScheduleEvent(EVENT_SUBMERGE, 180000); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { if (urand(0, 99) < 25) Talk(SAY_KILL); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (_introState != 2) { @@ -304,7 +304,7 @@ class boss_ragnaros : public CreatureScript bool _isBanished; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_ragnarosAI(creature); } @@ -322,13 +322,13 @@ class npc_son_of_flame : public CreatureScript instance = me->GetInstanceScript(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_RAGNAROS_ADDS, 1); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!UpdateVictim()) return; @@ -340,7 +340,7 @@ class npc_son_of_flame : public CreatureScript InstanceScript* instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_son_of_flameAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp index 435082b5a98..7c1d1af7d29 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_shazzrah.cpp @@ -56,7 +56,7 @@ class boss_shazzrah : public CreatureScript { } - void EnterCombat(Unit* target) + void EnterCombat(Unit* target) OVERRIDE { BossAI::EnterCombat(target); events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 6000); @@ -66,7 +66,7 @@ class boss_shazzrah : public CreatureScript events.ScheduleEvent(EVENT_BLINK, 30000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -117,7 +117,7 @@ class boss_shazzrah : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_shazzrahAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp index 0a2ddb9c43d..681f4f72bc6 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_sulfuron_harbinger.cpp @@ -67,7 +67,7 @@ class boss_sulfuron : public CreatureScript { } - void EnterCombat(Unit* victim) + void EnterCombat(Unit* victim) OVERRIDE { BossAI::EnterCombat(victim); events.ScheduleEvent(EVENT_DARK_STRIKE, 10000); @@ -77,7 +77,7 @@ class boss_sulfuron : public CreatureScript events.ScheduleEvent(EVENT_FLAMESPEAR, 2000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -127,7 +127,7 @@ class boss_sulfuron : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_sulfuronAI(creature); } @@ -144,17 +144,17 @@ class npc_flamewaker_priest : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { events.Reset(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { events.Reset(); } - void EnterCombat(Unit* victim) + void EnterCombat(Unit* victim) OVERRIDE { ScriptedAI::EnterCombat(victim); events.ScheduleEvent(EVENT_HEAL, urand(15000, 30000)); @@ -162,7 +162,7 @@ class npc_flamewaker_priest : public CreatureScript events.ScheduleEvent(EVENT_IMMOLATE, 8000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -203,7 +203,7 @@ class npc_flamewaker_priest : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_flamewaker_priestAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp index ec912440fa7..04e652b7f80 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp @@ -106,7 +106,7 @@ class instance_molten_core : public InstanceMapScript } } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { if (type == DATA_RAGNAROS_ADDS) { @@ -117,7 +117,7 @@ class instance_molten_core : public InstanceMapScript } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -128,7 +128,7 @@ class instance_molten_core : public InstanceMapScript return 0; } - uint64 GetData64(uint32 type) const + uint64 GetData64(uint32 type) const OVERRIDE { switch (type) { @@ -252,7 +252,7 @@ class instance_molten_core : public InstanceMapScript bool _summonedExecutus; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_molten_core_InstanceMapScript(map); } diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 0f0810e128a..c0db8e3eb0f 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -92,7 +92,7 @@ class npc_unworthy_initiate : public CreatureScript public: npc_unworthy_initiate() : CreatureScript("npc_unworthy_initiate") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_unworthy_initiateAI(creature); } @@ -114,7 +114,7 @@ public: EventMap events; - void Reset() + void Reset() OVERRIDE { anchorGUID = 0; phase = PHASE_CHAINED; @@ -125,7 +125,7 @@ public: me->LoadEquipment(0, true); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { events.ScheduleEvent(EVENT_ICY_TOUCH, 1000, GCD_CAST); events.ScheduleEvent(EVENT_PLAGUE_STRIKE, 3000, GCD_CAST); @@ -133,7 +133,7 @@ public: events.ScheduleEvent(EVENT_DEATH_COIL, 5000, GCD_CAST); } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -166,7 +166,7 @@ public: Talk(SAY_EVENT_START); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { switch (phase) { @@ -281,7 +281,7 @@ class npc_unworthy_initiate_anchor : public CreatureScript public: npc_unworthy_initiate_anchor() : CreatureScript("npc_unworthy_initiate_anchor") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_unworthy_initiate_anchorAI(creature); } @@ -292,13 +292,13 @@ public: uint64 prisonerGUID; - void SetGUID(uint64 guid, int32 /*id*/) + void SetGUID(uint64 guid, int32 /*id*/) OVERRIDE { if (!prisonerGUID) prisonerGUID = guid; } - uint64 GetGUID(int32 /*id*/) const + uint64 GetGUID(int32 /*id*/) const OVERRIDE { return prisonerGUID; } @@ -310,7 +310,7 @@ class go_acherus_soul_prison : public GameObjectScript public: go_acherus_soul_prison() : GameObjectScript("go_acherus_soul_prison") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (Creature* anchor = go->FindNearestCreature(29521, 15)) if (uint64 prisonerGUID = anchor->AI()->GetGUID()) @@ -352,7 +352,7 @@ class npc_death_knight_initiate : public CreatureScript public: npc_death_knight_initiate() : CreatureScript("npc_death_knight_initiate") { } - 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) @@ -379,7 +379,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(QUEST_DEATH_CHALLENGE) == QUEST_STATUS_INCOMPLETE && creature->IsFullHealth()) { @@ -395,7 +395,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_death_knight_initiateAI(creature); } @@ -412,7 +412,7 @@ public: uint32 m_uiDuelTimer; bool m_bIsDuelInProgress; - void Reset() + void Reset() OVERRIDE { lose = false; me->RestoreFaction(); @@ -425,7 +425,7 @@ public: m_bIsDuelInProgress = false; } - void SpellHit(Unit* pCaster, const SpellInfo* pSpell) + void SpellHit(Unit* pCaster, const SpellInfo* pSpell) OVERRIDE { if (!m_bIsDuelInProgress && pSpell->Id == SPELL_DUEL) { @@ -434,7 +434,7 @@ public: } } - void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) + void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) OVERRIDE { if (m_bIsDuelInProgress && pDoneBy->IsControlledByPlayer()) { @@ -457,7 +457,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (!UpdateVictim()) { @@ -520,7 +520,7 @@ class npc_dark_rider_of_acherus : public CreatureScript public: npc_dark_rider_of_acherus() : CreatureScript("npc_dark_rider_of_acherus") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_dark_rider_of_acherusAI(creature); } @@ -534,7 +534,7 @@ public: bool Intro; uint64 TargetGUID; - void Reset() + void Reset() OVERRIDE { PhaseTimer = 4000; Phase = 0; @@ -542,7 +542,7 @@ public: TargetGUID = 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!Intro || !TargetGUID) return; @@ -612,7 +612,7 @@ class npc_salanar_the_horseman : public CreatureScript public: npc_salanar_the_horseman() : CreatureScript("npc_salanar_the_horseman") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_salanar_the_horsemanAI(creature); } @@ -621,7 +621,7 @@ public: { npc_salanar_the_horsemanAI(Creature* creature) : ScriptedAI(creature) {} - void SpellHit(Unit* caster, const SpellInfo* spell) + void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_DELIVER_STOLEN_HORSE) { @@ -643,7 +643,8 @@ public: } } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { ScriptedAI::MoveInLineOfSight(who); @@ -684,7 +685,7 @@ class npc_ros_dark_rider : public CreatureScript public: npc_ros_dark_rider() : CreatureScript("npc_ros_dark_rider") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ros_dark_riderAI(creature); } @@ -693,12 +694,12 @@ public: { npc_ros_dark_riderAI(Creature* creature) : ScriptedAI(creature) {} - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { me->ExitVehicle(); } - void Reset() + void Reset() OVERRIDE { Creature* deathcharger = me->FindNearestCreature(28782, 30); if (!deathcharger) @@ -711,7 +712,7 @@ public: me->EnterVehicle(deathcharger); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { Creature* deathcharger = me->FindNearestCreature(28782, 30); if (!deathcharger) @@ -739,7 +740,7 @@ class npc_dkc1_gothik : public CreatureScript public: npc_dkc1_gothik() : CreatureScript("npc_dkc1_gothik") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_dkc1_gothikAI(creature); } @@ -748,7 +749,8 @@ public: { npc_dkc1_gothikAI(Creature* creature) : ScriptedAI(creature) {} - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { ScriptedAI::MoveInLineOfSight(who); @@ -782,7 +784,7 @@ class npc_scarlet_ghoul : public CreatureScript public: npc_scarlet_ghoul() : CreatureScript("npc_scarlet_ghoul") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_scarlet_ghoulAI(creature); } @@ -818,7 +820,7 @@ public: } } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!me->IsInCombat()) { @@ -884,7 +886,7 @@ class npc_scarlet_miner_cart : public CreatureScript me->SetDisplayId(me->GetCreatureTemplate()->Modelid1); // Modelid2 is a horse. } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { if (summon->GetEntry() == NPC_MINER) { @@ -893,13 +895,13 @@ class npc_scarlet_miner_cart : public CreatureScript } } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { if (summon->GetEntry() == NPC_MINER) _minerGUID = 0; } - void DoAction(int32 /*param*/) + void DoAction(int32 /*param*/) OVERRIDE { if (Creature* miner = ObjectAccessor::GetCreature(*me, _minerGUID)) { @@ -913,7 +915,7 @@ class npc_scarlet_miner_cart : public CreatureScript } } - void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) + void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) OVERRIDE { if (apply) { @@ -933,7 +935,7 @@ class npc_scarlet_miner_cart : public CreatureScript uint64 _playerGUID; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_scarlet_miner_cartAI(creature); } @@ -965,14 +967,14 @@ class npc_scarlet_miner : public CreatureScript uint32 IntroPhase; uint64 carGUID; - void Reset() + void Reset() OVERRIDE { carGUID = 0; IntroTimer = 0; IntroPhase = 0; } - void IsSummonedBy(Unit* summoner) + void IsSummonedBy(Unit* summoner) OVERRIDE { carGUID = summoner->GetGUID(); } @@ -1010,14 +1012,14 @@ class npc_scarlet_miner : public CreatureScript } } - void SetGUID(uint64 guid, int32 /*id = 0*/) + void SetGUID(uint64 guid, int32 /*id = 0*/) OVERRIDE { InitWaypoint(); Start(false, false, guid); SetDespawnAtFar(false); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -1042,7 +1044,7 @@ class npc_scarlet_miner : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (IntroPhase) { @@ -1069,7 +1071,7 @@ class npc_scarlet_miner : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_scarlet_minerAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index 024ef01ce6d..0e70a0f0066 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -44,7 +44,7 @@ class npc_crusade_persuaded : public CreatureScript public: npc_crusade_persuaded() : CreatureScript("npc_crusade_persuaded") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_crusade_persuadedAI (creature); } @@ -57,7 +57,7 @@ public: uint32 speechCounter; uint64 playerGUID; - void Reset() + void Reset() OVERRIDE { speechTimer = 0; speechCounter = 0; @@ -66,7 +66,7 @@ public: me->RestoreFaction(); } - void SpellHit(Unit* caster, const SpellInfo* spell) + void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_PERSUASIVE_STRIKE && caster->GetTypeId() == TYPEID_PLAYER && me->IsAlive() && !speechCounter) { @@ -90,7 +90,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (speechCounter) { @@ -191,7 +191,7 @@ class npc_koltira_deathweaver : public CreatureScript public: npc_koltira_deathweaver() : CreatureScript("npc_koltira_deathweaver") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_BREAKOUT) { @@ -210,7 +210,7 @@ public: me->SetReactState(REACT_DEFENSIVE); } - void Reset() + void Reset() OVERRIDE { if (!HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -224,7 +224,7 @@ public: } } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -258,7 +258,7 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (Player* player = GetPlayerForEscort()) summoned->AI()->AttackStart(player); @@ -275,7 +275,7 @@ public: me->SummonCreature(NPC_CRIMSON_ACOLYTE, 1642.329f, -6045.818f, 127.583f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { npc_escortAI::UpdateAI(uiDiff); @@ -347,7 +347,7 @@ public: }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_koltira_deathweaverAI(creature); } @@ -368,7 +368,7 @@ class npc_scarlet_courier : public CreatureScript public: npc_scarlet_courier() : CreatureScript("npc_scarlet_courier") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_scarlet_courierAI (creature); } @@ -380,21 +380,21 @@ public: uint32 uiStage; uint32 uiStage_timer; - void Reset() + void Reset() OVERRIDE { me->Mount(14338); // not sure about this id uiStage = 1; uiStage_timer = 3000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_TREE2); me->Dismount(); uiStage = 0; } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -403,7 +403,7 @@ public: uiStage = 2; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (uiStage && !me->IsInCombat()) { @@ -460,7 +460,7 @@ class npc_high_inquisitor_valroth : public CreatureScript public: npc_high_inquisitor_valroth() : CreatureScript("npc_high_inquisitor_valroth") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_high_inquisitor_valrothAI (creature); } @@ -473,20 +473,20 @@ public: uint32 uiInquisitor_Penance_timer; uint32 uiValroth_Smite_timer; - void Reset() + void Reset() OVERRIDE { uiRenew_timer = 1000; uiInquisitor_Penance_timer = 2000; uiValroth_Smite_timer = 1000; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { Talk(SAY_VALROTH_AGGRO); DoCast(who, SPELL_VALROTH_SMITE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (uiRenew_timer <= diff) { @@ -518,7 +518,7 @@ public: Talk(SAY_VALROTH_RAND); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { Talk(SAY_VALROTH_DEATH); killer->CastSpell(me, SPELL_SUMMON_VALROTH_REMAINS, true); @@ -596,7 +596,7 @@ class npc_a_special_surprise : public CreatureScript public: npc_a_special_surprise() : CreatureScript("npc_a_special_surprise") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_a_special_surpriseAI(creature); } @@ -609,7 +609,7 @@ public: uint32 ExecuteSpeech_Counter; uint64 PlayerGUID; - void Reset() + void Reset() OVERRIDE { ExecuteSpeech_Timer = 0; ExecuteSpeech_Counter = 0; @@ -667,7 +667,8 @@ public: return false; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (PlayerGUID || who->GetTypeId() != TYPEID_PLAYER || !who->IsWithinDist(me, INTERACTION_DISTANCE)) return; @@ -676,7 +677,7 @@ public: PlayerGUID = who->GetGUID(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (PlayerGUID && !me->GetVictim() && me->IsAlive()) { diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp index 4aff2e93212..6d0c3eb53c7 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -275,7 +275,7 @@ class npc_highlord_darion_mograine : public CreatureScript public: npc_highlord_darion_mograine() : CreatureScript("npc_highlord_darion_mograine") { } - 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) @@ -289,7 +289,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -302,7 +302,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_highlord_darion_mograineAI(creature); } @@ -353,7 +353,7 @@ public: uint64 uiGhoulGUID[ENCOUNTER_GHOUL_NUMBER]; uint64 uiWarriorGUID[ENCOUNTER_WARRIOR_NUMBER]; - void Reset() + void Reset() OVERRIDE { if (!HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -453,7 +453,7 @@ public: } } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who) return; @@ -470,7 +470,8 @@ public: } } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!who) return; @@ -485,7 +486,7 @@ public: SetEscortPaused(bOnHold); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -600,13 +601,13 @@ public: } } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { if (!bIsBattle)//do not reset self if we are in battle npc_escortAI::EnterEvadeMode(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { npc_escortAI::UpdateAI(diff); @@ -1652,7 +1653,7 @@ class npc_the_lich_king_tirion_dawn : public CreatureScript public: npc_the_lich_king_tirion_dawn() : CreatureScript("npc_the_lich_king_tirion_dawn") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_the_lich_king_tirion_dawnAI (creature); } @@ -1660,10 +1661,10 @@ public: struct npc_the_lich_king_tirion_dawnAI : public ScriptedAI { npc_the_lich_king_tirion_dawnAI(Creature* creature) : ScriptedAI(creature) { Reset(); } - void Reset() {} - void AttackStart(Unit* /*who*/) {} // very sample, just don't make them aggreesive - void UpdateAI(uint32 /*diff*/) {} - void JustDied(Unit* /*killer*/) {} + void Reset() OVERRIDE {} + void AttackStart(Unit* /*who*/) {} // very sample, just don't make them aggreesive OVERRIDE + void UpdateAI(uint32 /*diff*/) OVERRIDE {} + void JustDied(Unit* /*killer*/) OVERRIDE {} }; }; diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp index 21b8ede86fa..c310bc635cc 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp @@ -39,7 +39,7 @@ class npc_valkyr_battle_maiden : public CreatureScript public: npc_valkyr_battle_maiden() : CreatureScript("npc_valkyr_battle_maiden") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_valkyr_battle_maidenAI (creature); } @@ -52,7 +52,7 @@ public: float x, y, z; uint32 phase; - void Reset() + void Reset() OVERRIDE { me->setActive(true); me->SetVisible(false); @@ -69,7 +69,7 @@ public: me->SetPosition(x, y, z, 0.0f); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (FlyBackTimer <= diff) { diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp index 91fa6b7df94..85f0a9e7cbd 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp @@ -46,7 +46,7 @@ class boss_arcanist_doan : public CreatureScript public: boss_arcanist_doan() : CreatureScript("boss_arcanist_doan") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_arcanist_doanAI (creature); } @@ -61,7 +61,7 @@ public: bool bCanDetonate; bool bShielded; - void Reset() + void Reset() OVERRIDE { Polymorph_Timer = 20000; AoESilence_Timer = 15000; @@ -70,12 +70,12 @@ public: bShielded = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp index b225faa04e0..6b799f8c91a 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp @@ -38,7 +38,7 @@ class boss_azshir_the_sleepless : public CreatureScript public: boss_azshir_the_sleepless() : CreatureScript("boss_azshir_the_sleepless") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_azshir_the_sleeplessAI (creature); } @@ -51,16 +51,16 @@ public: uint32 CallOftheGrave_Timer; uint32 Terrify_Timer; - void Reset() + void Reset() OVERRIDE { SoulSiphon_Timer = 1; CallOftheGrave_Timer = 30000; Terrify_Timer = 20000; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp index 4b1633a80b6..b352c5e25c9 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp @@ -46,7 +46,7 @@ class boss_bloodmage_thalnos : public CreatureScript public: boss_bloodmage_thalnos() : CreatureScript("boss_bloodmage_thalnos") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_bloodmage_thalnosAI (creature); } @@ -61,7 +61,7 @@ public: uint32 FlameSpike_Timer; uint32 FireNova_Timer; - void Reset() + void Reset() OVERRIDE { HpYell = false; FlameShock_Timer = 10000; @@ -70,17 +70,17 @@ public: FireNova_Timer = 40000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*Victim*/) + void KilledUnit(Unit* /*Victim*/) OVERRIDE { Talk(SAY_KILL); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 4334242641c..81f09e90178 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -146,7 +146,7 @@ class npc_wisp_invis : public CreatureScript public: npc_wisp_invis() : CreatureScript("npc_wisp_invis") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_wisp_invisAI (creature); } @@ -162,8 +162,8 @@ public: uint32 delay; uint32 spell; uint32 spell2; - void Reset() {} - void EnterCombat(Unit* /*who*/) {} + void Reset() OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} void SetType(uint32 _type) { switch (Creaturetype = _type) @@ -189,13 +189,14 @@ public: DoCast(me, spell); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_WISP_FLIGHT_PORT && Creaturetype == 4) me->SetDisplayId(2027); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!who || Creaturetype != 1 || !who->isTargetableForAttack()) return; @@ -204,7 +205,7 @@ public: DoCast(who, SPELL_SQUASH_SOUL); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (delay) { @@ -225,7 +226,7 @@ class npc_head : public CreatureScript public: npc_head() : CreatureScript("npc_head") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_headAI (creature); } @@ -243,7 +244,7 @@ public: bool withbody; bool die; - void Reset() + void Reset() OVERRIDE { Phase = 0; bodyGUID = 0; @@ -253,7 +254,7 @@ public: laugh = urand(15000, 30000); } - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} void SaySound(uint8 textEntry, Unit* target = 0) { @@ -268,7 +269,7 @@ public: laugh += 3000; } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { if (withbody) return; @@ -299,7 +300,7 @@ public: } } - void SpellHit(Unit* caster, const SpellInfo* spell) + void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE { if (!withbody) return; @@ -325,7 +326,7 @@ public: } void Disappear(); - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!withbody) { @@ -374,7 +375,7 @@ class boss_headless_horseman : public CreatureScript public: boss_headless_horseman() : CreatureScript("boss_headless_horseman") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_headless_horsemanAI (creature); } @@ -410,7 +411,7 @@ public: bool wp_reached; bool burned; - void Reset() + void Reset() OVERRIDE { Phase = 1; conflagrate = 15000; @@ -453,7 +454,7 @@ public: Phase = 0; } - void MovementInform(uint32 type, uint32 i) + void MovementInform(uint32 type, uint32 i) OVERRIDE { if (type != POINT_MOTION_TYPE || !IsFlying || i != id) return; @@ -494,25 +495,26 @@ public: ++id; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) instance->SetData(DATA_HORSEMAN_EVENT, IN_PROGRESS); DoZoneInCombat(); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (withhead && Phase != 0) ScriptedAI::MoveInLineOfSight(who); } - void KilledUnit(Unit* player) + void KilledUnit(Unit* player) OVERRIDE { if (player->GetTypeId() == TYPEID_PLAYER) { @@ -558,13 +560,13 @@ public: return NULL; } - void SpellHitTarget(Unit* unit, const SpellInfo* spell) + void SpellHitTarget(Unit* unit, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_CONFLAGRATION && unit->HasAura(SPELL_CONFLAGRATION)) SaySound(SAY_CONFLAGRATION, unit); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { me->StopMoving(); //me->GetMotionMaster()->MoveIdle(); @@ -581,7 +583,7 @@ public: sLFGMgr->FinishDungeon(players.begin()->GetSource()->GetGroup()->GetGUID(), 285); } - void SpellHit(Unit* caster, const SpellInfo* spell) + void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE { if (withhead) return; @@ -611,7 +613,7 @@ public: } } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { if (damage >= me->GetHealth() && withhead) { @@ -640,7 +642,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (withhead) { @@ -783,7 +785,7 @@ class npc_pulsing_pumpkin : public CreatureScript public: npc_pulsing_pumpkin() : CreatureScript("npc_pulsing_pumpkin") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_pulsing_pumpkinAI (creature); } @@ -795,7 +797,7 @@ public: bool sprouted; uint64 debuffGUID; - void Reset() + void Reset() OVERRIDE { float x, y, z; me->GetPosition(x, y, z); //this visual aura some under ground @@ -815,9 +817,9 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_SPROUTING) { @@ -843,13 +845,14 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (!sprouted) Despawn(); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!who || !me->IsValidAttackTarget(who) || me->GetVictim()) return; @@ -859,7 +862,7 @@ public: DoStartMovement(who); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (sprouted && UpdateVictim()) DoMeleeAttackIfReady(); @@ -872,7 +875,7 @@ class go_loosely_turned_soil : public GameObjectScript public: go_loosely_turned_soil() : GameObjectScript("go_loosely_turned_soil") { } - bool OnGossipHello(Player* player, GameObject* soil) + bool OnGossipHello(Player* player, GameObject* soil) OVERRIDE { InstanceScript* instance = player->GetInstanceScript(); if (instance) diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp index ff0bc877686..3c662fae9f8 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp @@ -55,7 +55,7 @@ class boss_herod : public CreatureScript public: boss_herod() : CreatureScript("boss_herod") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_herodAI(creature); } @@ -69,31 +69,31 @@ public: uint32 Cleave_Timer; uint32 Whirlwind_Timer; - void Reset() + void Reset() OVERRIDE { Enrage = false; Cleave_Timer = 12000; Whirlwind_Timer = 60000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); DoCast(me, SPELL_RUSHINGCHARGE); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { for (uint8 i = 0; i < 20; ++i) me->SummonCreature(ENTRY_SCARLET_TRAINEE, 1939.18f, -431.58f, 17.09f, 6.22f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -134,7 +134,7 @@ class npc_scarlet_trainee : public CreatureScript public: npc_scarlet_trainee() : CreatureScript("npc_scarlet_trainee") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_scarlet_traineeAI(creature); } @@ -148,11 +148,11 @@ public: uint32 Start_Timer; - void Reset() {} - void WaypointReached(uint32 /*waypointId*/) {} - void EnterCombat(Unit* /*who*/) {} + void Reset() OVERRIDE {} + void WaypointReached(uint32 /*waypointId*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (Start_Timer) { diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp index e27e78383f7..24c2e501d99 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp @@ -41,7 +41,7 @@ class boss_high_inquisitor_fairbanks : public CreatureScript public: boss_high_inquisitor_fairbanks() : CreatureScript("boss_high_inquisitor_fairbanks") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_high_inquisitor_fairbanksAI (creature); } @@ -58,7 +58,7 @@ public: uint32 Dispel_Timer; bool PowerWordShield; - void Reset() + void Reset() OVERRIDE { CurseOfBlood_Timer = 10000; DispelMagic_Timer = 30000; @@ -71,13 +71,13 @@ public: me->SetUInt32Value(UNIT_FIELD_BYTES_1, 7); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { me->SetStandState(UNIT_STAND_STATE_STAND); me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp index f0f5c3611ab..b8da010773a 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp @@ -42,7 +42,7 @@ class boss_houndmaster_loksey : public CreatureScript public: boss_houndmaster_loksey() : CreatureScript("boss_houndmaster_loksey") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_houndmaster_lokseyAI (creature); } @@ -53,17 +53,17 @@ public: uint32 BloodLust_Timer; - void Reset() + void Reset() OVERRIDE { BloodLust_Timer = 20000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp index 857e046ec04..8ce0b430039 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp @@ -46,7 +46,7 @@ class boss_interrogator_vishas : public CreatureScript public: boss_interrogator_vishas() : CreatureScript("boss_interrogator_vishas") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_interrogator_vishasAI (creature); } @@ -64,22 +64,22 @@ public: bool Yell60; uint32 ShadowWordPain_Timer; - void Reset() + void Reset() OVERRIDE { ShadowWordPain_Timer = 5000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*Victim*/) + void KilledUnit(Unit* /*Victim*/) OVERRIDE { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (!instance) return; @@ -89,7 +89,7 @@ public: vorrel->AI()->Talk(SAY_TRIGGER_VORREL); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp index 3169bf754f3..3492896dd5d 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp @@ -63,7 +63,7 @@ class boss_scarlet_commander_mograine : public CreatureScript public: boss_scarlet_commander_mograine() : CreatureScript("boss_scarlet_commander_mograine") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_scarlet_commander_mograineAI (creature); } @@ -84,7 +84,7 @@ public: bool _bHeal; bool _bFakeDeath; - void Reset() + void Reset() OVERRIDE { CrusaderStrike_Timer = 10000; HammerOfJustice_Timer = 10000; @@ -103,7 +103,7 @@ public: _bFakeDeath = false; } - void JustReachedHome() + void JustReachedHome() OVERRIDE { if (instance) { @@ -112,7 +112,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_MO_AGGRO); DoCast(me, SPELL_RETRIBUTIONAURA); @@ -120,12 +120,12 @@ public: me->CallForHelp(VISIBLE_RANGE); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_MO_KILL); } - void DamageTaken(Unit* /*doneBy*/, uint32 &damage) + void DamageTaken(Unit* /*doneBy*/, uint32 &damage) OVERRIDE { if (damage < me->GetHealth() || _bHasDied || _bFakeDeath) return; @@ -162,7 +162,7 @@ public: } } - void SpellHit(Unit* /*who*/, const SpellInfo* spell) + void SpellHit(Unit* /*who*/, const SpellInfo* spell) OVERRIDE { //When hit with ressurection say text if (spell->Id == SPELL_SCARLETRESURRECTION) @@ -175,7 +175,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -229,7 +229,7 @@ class boss_high_inquisitor_whitemane : public CreatureScript public: boss_high_inquisitor_whitemane() : CreatureScript("boss_high_inquisitor_whitemane") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_high_inquisitor_whitemaneAI (creature); } @@ -251,7 +251,7 @@ public: bool _bCanResurrectCheck; bool _bCanResurrect; - void Reset() + void Reset() OVERRIDE { Wait_Timer = 7000; Heal_Timer = 10000; @@ -266,7 +266,7 @@ public: instance->SetData(TYPE_MOGRAINE_AND_WHITE_EVENT, NOT_STARTED); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (instance && instance->GetData(TYPE_MOGRAINE_AND_WHITE_EVENT) == NOT_STARTED) return; @@ -274,23 +274,23 @@ public: ScriptedAI::AttackStart(who); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_WH_INTRO); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_WH_KILL); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) + void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE { if (!_bCanResurrectCheck && damage >= me->GetHealth()) damage = me->GetHealth() - 1; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp index 8a61b3088e1..545f5d69bdc 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp @@ -39,7 +39,7 @@ class boss_scorn : public CreatureScript public: boss_scorn() : CreatureScript("boss_scorn") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_scornAI (creature); } @@ -53,7 +53,7 @@ public: uint32 MindFlay_Timer; uint32 FrostNova_Timer; - void Reset() + void Reset() OVERRIDE { LichSlap_Timer = 45000; FrostboltVolley_Timer = 30000; @@ -61,9 +61,9 @@ public: FrostNova_Timer = 30000; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp index 2e1f1e554b5..3bd00cf243f 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp @@ -42,7 +42,7 @@ class instance_scarlet_monastery : public InstanceMapScript public: instance_scarlet_monastery() : InstanceMapScript("instance_scarlet_monastery", 189) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_scarlet_monastery_InstanceMapScript(map); } @@ -100,7 +100,7 @@ public: } } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -132,7 +132,7 @@ public: } } - uint64 GetData64(uint32 type) const + uint64 GetData64(uint32 type) const OVERRIDE { switch (type) { @@ -147,7 +147,7 @@ public: return 0; } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == TYPE_MOGRAINE_AND_WHITE_EVENT) return encounter[0]; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index dccb7ccbaa0..440b91b1d1e 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp @@ -56,21 +56,21 @@ class boss_darkmaster_gandling : public CreatureScript { boss_darkmaster_gandlingAI(Creature* creature) : BossAI(creature, DATA_DARKMASTERGANDLING) {} - void Reset() + void Reset() OVERRIDE { _Reset(); if (GameObject* gate = me->GetMap()->GetGameObject(instance->GetData64(GO_GATE_GANDLING))) gate->SetGoState(GO_STATE_ACTIVE); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); if (GameObject* gate = me->GetMap()->GetGameObject(instance->GetData64(GO_GATE_GANDLING))) gate->SetGoState(GO_STATE_ACTIVE); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_ARCANEMISSILES, 4500); @@ -82,13 +82,13 @@ class boss_darkmaster_gandling : public CreatureScript gate->SetGoState(GO_STATE_READY); } - void IsSummonedBy(Unit* /*summoner*/) + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE { Talk(YELL_SUMMONED); me->GetMotionMaster()->MoveRandom(5); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -126,7 +126,7 @@ class boss_darkmaster_gandling : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_darkmaster_gandlingAI (creature); } @@ -211,13 +211,13 @@ class spell_shadow_portal : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_shadow_portal_SpellScript::HandleCast, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_shadow_portal_SpellScript(); } @@ -341,13 +341,13 @@ class spell_shadow_portal_rooms : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_shadow_portal_rooms_SpellScript::HandleSendEvent, EFFECT_1, SPELL_EFFECT_SEND_EVENT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_shadow_portal_rooms_SpellScript(); } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp index fffcc7cdf11..7f7c0c195b1 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp @@ -31,7 +31,7 @@ class boss_death_knight_darkreaver : public CreatureScript public: boss_death_knight_darkreaver() : CreatureScript("boss_death_knight_darkreaver") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_death_knight_darkreaverAI (creature); } @@ -40,17 +40,17 @@ public: { boss_death_knight_darkreaverAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { if (me->GetHealth() <= damage) DoCast(me, 23261, true); //Summon Darkreaver's Fallen Charger } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } }; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp index 0f1999b112f..15bd7c13e36 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp @@ -53,7 +53,7 @@ class boss_doctor_theolen_krastinov : public CreatureScript { boss_theolenkrastinovAI(Creature* creature) : BossAI(creature, DATA_DOCTORTHEOLENKRASTINOV) {} - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_REND, 8000); @@ -61,7 +61,7 @@ class boss_doctor_theolen_krastinov : public CreatureScript events.ScheduleEvent(EVENT_FRENZY, 1000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -97,7 +97,7 @@ class boss_doctor_theolen_krastinov : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_theolenkrastinovAI (creature); } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp index 5ea6c86d23e..1ee53cc91a5 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp @@ -50,7 +50,7 @@ class boss_illucia_barov : public CreatureScript { boss_illuciabarovAI(Creature* creature) : BossAI(creature, DATA_LADYILLUCIABAROV) {} - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_CURSEOFAGONY, 18000); @@ -59,7 +59,7 @@ class boss_illucia_barov : public CreatureScript events.ScheduleEvent(EVENT_FEAR, 30000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -98,7 +98,7 @@ class boss_illucia_barov : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_illuciabarovAI (creature); } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp index 1d311a7bd2c..6b2a38f089d 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp @@ -55,14 +55,14 @@ class boss_instructor_malicia : public CreatureScript uint32 FlashCounter; uint32 TouchCounter; - void Reset() + void Reset() OVERRIDE { _Reset(); FlashCounter = 0; TouchCounter = 0; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_CALLOFGRAVES, 4000); @@ -72,7 +72,7 @@ class boss_instructor_malicia : public CreatureScript events.ScheduleEvent(EVENT_HEALINGTOUCH, 45000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -135,7 +135,7 @@ class boss_instructor_malicia : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_instructormaliciaAI (creature); } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp index d28b21992b5..5a339975138 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp @@ -40,7 +40,7 @@ class boss_jandice_barov : public CreatureScript public: boss_jandice_barov() : CreatureScript("boss_jandice_barov") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_jandicebarovAI (creature); } @@ -55,7 +55,7 @@ public: uint32 Invisible_Timer; bool Invisible; - void Reset() + void Reset() OVERRIDE { CurseOfBlood_Timer = 15000; Illusion_Timer = 30000; @@ -63,7 +63,7 @@ public: Invisible = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } @@ -73,7 +73,7 @@ public: Illusion->AI()->AttackStart(victim); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (Invisible && Invisible_Timer <= diff) { @@ -162,7 +162,7 @@ class npc_illusionofjandicebarov : public CreatureScript public: npc_illusionofjandicebarov() : CreatureScript("npc_illusionofjandicebarov") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_illusionofjandicebarovAI (creature); } @@ -173,17 +173,17 @@ public: uint32 Cleave_Timer; - void Reset() + void Reset() OVERRIDE { Cleave_Timer = urand(2000, 8000); me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp index 5fc5c48e049..2433390f8f5 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp @@ -78,12 +78,12 @@ class boss_kirtonos_the_herald : public CreatureScript { boss_kirtonos_the_heraldAI(Creature* creature) : BossAI(creature, DATA_KIRTONOS) { } - void Reset() + void Reset() OVERRIDE { _Reset(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { events.ScheduleEvent(EVENT_SWOOP, urand(8000, 8000)); events.ScheduleEvent(EVENT_WING_FLAP, urand(15000, 15000)); @@ -96,7 +96,7 @@ class boss_kirtonos_the_herald : public CreatureScript _EnterCombat(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (GameObject* gate = me->GetMap()->GetGameObject(instance->GetData64(GO_GATE_KIRTONOS))) gate->SetGoState(GO_STATE_ACTIVE); @@ -108,7 +108,7 @@ class boss_kirtonos_the_herald : public CreatureScript _JustDied(); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { if (GameObject* gate = me->GetMap()->GetGameObject(instance->GetData64(GO_GATE_KIRTONOS))) gate->SetGoState(GO_STATE_ACTIVE); @@ -120,7 +120,7 @@ class boss_kirtonos_the_herald : public CreatureScript me->DespawnOrUnsummon(5000); } - void IsSummonedBy(Unit* /*summoner*/) + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE { events.ScheduleEvent(INTRO_1, 500); me->SetDisableGravity(true); @@ -129,12 +129,12 @@ class boss_kirtonos_the_herald : public CreatureScript Talk(EMOTE_SUMMONED); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { BossAI::JustSummoned(summon); } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type == WAYPOINT_MOTION_TYPE && id == POINT_KIRTONOS_LAND) { @@ -142,7 +142,7 @@ class boss_kirtonos_the_herald : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { events.Update(diff); @@ -251,7 +251,7 @@ class boss_kirtonos_the_herald : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_kirtonos_the_heraldAI(creature); } @@ -277,7 +277,7 @@ class go_brazier_of_the_herald : public GameObjectScript public: go_brazier_of_the_herald() : GameObjectScript("go_brazier_of_the_herald") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { go->UseDoorOrButton(); go->PlayDirectSound(SOUND_SCREECH, 0); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp index cfc1376b3ae..abf54e5e748 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp @@ -37,7 +37,7 @@ class boss_kormok : public CreatureScript public: boss_kormok() : CreatureScript("boss_kormok") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_kormokAI (creature); } @@ -52,7 +52,7 @@ public: uint32 Mage_Timer; bool Mages; - void Reset() + void Reset() OVERRIDE { ShadowVolley_Timer = 10000; BoneShield_Timer = 2000; @@ -61,7 +61,7 @@ public: Mages = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } @@ -77,7 +77,7 @@ public: SummonedMage->AI()->AttackStart(victim); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp index d0028894067..d18669e19c2 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp @@ -46,20 +46,20 @@ class boss_lord_alexei_barov : public CreatureScript { boss_lordalexeibarovAI(Creature* creature) : BossAI(creature, DATA_LORDALEXEIBAROV) {} - void Reset() + void Reset() OVERRIDE { _Reset(); me->LoadCreaturesAddon(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_IMMOLATE, 7000); events.ScheduleEvent(EVENT_VEILOFSHADOW, 15000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -90,7 +90,7 @@ class boss_lord_alexei_barov : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_lordalexeibarovAI (creature); } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp index f7170a0618f..a7b0d7444c8 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp @@ -50,7 +50,7 @@ class boss_lorekeeper_polkelt : public CreatureScript { boss_lorekeeperpolkeltAI(Creature* creature) : BossAI(creature, DATA_LOREKEEPERPOLKELT) {} - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_VOLATILEINFECTION, 38000); @@ -59,7 +59,7 @@ class boss_lorekeeper_polkelt : public CreatureScript events.ScheduleEvent(EVENT_NOXIOUSCATALYST, 35000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -98,7 +98,7 @@ class boss_lorekeeper_polkelt : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_lorekeeperpolkeltAI (creature); } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp index 00fb2220210..9ae301c7720 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp @@ -41,7 +41,7 @@ class boss_boss_ras_frostwhisper : public CreatureScript public: boss_boss_ras_frostwhisper() : CreatureScript("boss_boss_ras_frostwhisper") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_rasfrostAI (creature); } @@ -57,7 +57,7 @@ public: uint32 ChillNova_Timer; uint32 FrostVolley_Timer; - void Reset() + void Reset() OVERRIDE { IceArmor_Timer = 2000; Frostbolt_Timer = 8000; @@ -69,9 +69,9 @@ public: DoCast(me, SPELL_ICEARMOR, true); } - void EnterCombat(Unit* /*who*/){} + void EnterCombat(Unit* /*who*/)OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp index 14caccb8b00..84425e0b664 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp @@ -50,7 +50,7 @@ class boss_the_ravenian : public CreatureScript { boss_theravenianAI(Creature* creature) : BossAI(creature, DATA_THERAVENIAN) {} - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_TRAMPLE, 24000); @@ -59,7 +59,7 @@ class boss_the_ravenian : public CreatureScript events.ScheduleEvent(EVENT_KNOCKAWAY, 32000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -98,7 +98,7 @@ class boss_the_ravenian : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_theravenianAI (creature); } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp index 2551400ccc3..36788a174f5 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp @@ -44,7 +44,7 @@ class boss_vectus : public CreatureScript public: boss_vectus() : CreatureScript("boss_vectus") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_vectusAI (creature); } @@ -57,14 +57,14 @@ public: uint32 m_uiBlastWave_Timer; uint32 m_uiFrenzy_Timer; - void Reset() + void Reset() OVERRIDE { m_uiFireShield_Timer = 2000; m_uiBlastWave_Timer = 14000; m_uiFrenzy_Timer = 0; } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp index 0da31fbe428..abe79a89522 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp @@ -27,7 +27,7 @@ class instance_scholomance : public InstanceMapScript public: instance_scholomance() : InstanceMapScript("instance_scholomance", 289) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_scholomance_InstanceMapScript(map); } @@ -106,7 +106,7 @@ class instance_scholomance : public InstanceMapScript return true; } - uint64 GetData64(uint32 type) const + uint64 GetData64(uint32 type) const OVERRIDE { switch (type) { diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index 9e351360f3c..346c9f0f038 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -71,7 +71,7 @@ class instance_shadowfang_keep : public InstanceMapScript public: instance_shadowfang_keep() : InstanceMapScript("instance_shadowfang_keep", 33) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_shadowfang_keep_InstanceMapScript(map); } @@ -154,7 +154,7 @@ public: } } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -202,7 +202,7 @@ public: } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp index 0b0556fb3a8..d5c3d27eed3 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp @@ -70,12 +70,12 @@ class npc_shadowfang_prisoner : public CreatureScript public: npc_shadowfang_prisoner() : CreatureScript("npc_shadowfang_prisoner") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_shadowfang_prisonerAI(creature); } - 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) @@ -88,7 +88,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { InstanceScript* instance = creature->GetInstanceScript(); @@ -109,7 +109,7 @@ public: InstanceScript* instance; - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -145,8 +145,8 @@ public: } } - void Reset() {} - void EnterCombat(Unit* /*who*/) {} + void Reset() OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} }; }; @@ -156,7 +156,7 @@ class npc_arugal_voidwalker : public CreatureScript public: npc_arugal_voidwalker() : CreatureScript("npc_arugal_voidwalker") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_arugal_voidwalkerAI(creature); } @@ -172,12 +172,12 @@ public: uint32 uiDarkOffering; - void Reset() + void Reset() OVERRIDE { uiDarkOffering = urand(200, 1000); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (!UpdateVictim()) return; @@ -194,7 +194,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(TYPE_FENRUS, instance->GetData(TYPE_FENRUS) + 1); @@ -228,7 +228,7 @@ class spell_shadowfang_keep_haunting_spirits : public SpellScriptLoader aurEff->CalculatePeriodic(GetCaster()); } - void Register() + void Register() OVERRIDE { DoEffectCalcPeriodic += AuraEffectCalcPeriodicFn(spell_shadowfang_keep_haunting_spirits_AuraScript::CalcPeriodic, EFFECT_0, SPELL_AURA_DUMMY); OnEffectPeriodic += AuraEffectPeriodicFn(spell_shadowfang_keep_haunting_spirits_AuraScript::HandleDummyTick, EFFECT_0, SPELL_AURA_DUMMY); @@ -236,7 +236,7 @@ class spell_shadowfang_keep_haunting_spirits : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_shadowfang_keep_haunting_spirits_AuraScript(); } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp index d2b884188c6..84cbd9d80e9 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp @@ -66,7 +66,7 @@ class boss_baron_rivendare : public CreatureScript public: boss_baron_rivendare() : CreatureScript("boss_baron_rivendare") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_baron_rivendareAI (creature); } @@ -86,7 +86,7 @@ public: // uint32 RaiseDead_Timer; uint32 SummonSkeletons_Timer; - void Reset() + void Reset() OVERRIDE { ShadowBolt_Timer = 5000; Cleave_Timer = 8000; @@ -97,26 +97,26 @@ public: instance->SetData(TYPE_BARON, NOT_STARTED); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (instance)//can't use entercombat(), boss' dmg aura sets near players in combat, before entering the room's door instance->SetData(TYPE_BARON, IN_PROGRESS); ScriptedAI::AttackStart(who); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) summoned->AI()->AttackStart(target); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(TYPE_BARON, DONE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp index 9d239af33c7..edca989f2bc 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp @@ -40,7 +40,7 @@ class boss_baroness_anastari : public CreatureScript public: boss_baroness_anastari() : CreatureScript("boss_baroness_anastari") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_baroness_anastariAI (creature); } @@ -59,7 +59,7 @@ public: uint32 Silence_Timer; //uint32 Possess_Timer; - void Reset() + void Reset() OVERRIDE { BansheeWail_Timer = 1000; BansheeCurse_Timer = 11000; @@ -67,17 +67,17 @@ public: //Possess_Timer = 35000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(TYPE_BARONESS, IN_PROGRESS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp index cdf76bba3ed..5c085d041d4 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp @@ -85,7 +85,7 @@ class boss_cannon_master_willey : public CreatureScript public: boss_cannon_master_willey() : CreatureScript("boss_cannon_master_willey") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_cannon_master_willeyAI (creature); } @@ -99,7 +99,7 @@ public: uint32 Shoot_Timer; uint32 SummonRifleman_Timer; - void Reset() + void Reset() OVERRIDE { Shoot_Timer = 1000; Pummel_Timer = 7000; @@ -107,7 +107,7 @@ public: SummonRifleman_Timer = 15000; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { me->SummonCreature(11054, ADD_1X, ADD_1Y, ADD_1Z, ADD_1O, TEMPSUMMON_TIMED_DESPAWN, 240000); me->SummonCreature(11054, ADD_2X, ADD_2Y, ADD_2Z, ADD_2O, TEMPSUMMON_TIMED_DESPAWN, 240000); @@ -118,11 +118,11 @@ public: me->SummonCreature(11054, ADD_9X, ADD_9Y, ADD_9Z, ADD_9O, TEMPSUMMON_TIMED_DESPAWN, 240000); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp index 783579f37a9..0365c0dd5ae 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp @@ -74,7 +74,7 @@ class boss_dathrohan_balnazzar : public CreatureScript public: boss_dathrohan_balnazzar() : CreatureScript("boss_dathrohan_balnazzar") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_dathrohan_balnazzarAI (creature); } @@ -93,7 +93,7 @@ public: uint32 m_uiMindControl_Timer; bool m_bTransformed; - void Reset() + void Reset() OVERRIDE { m_uiCrusadersHammer_Timer = 8000; m_uiCrusaderStrike_Timer = 12000; @@ -109,7 +109,7 @@ public: me->UpdateEntry(NPC_DATHROHAN); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { static uint32 uiCount = sizeof(m_aSummonPoint)/sizeof(SummonDef); @@ -119,11 +119,11 @@ public: TEMPSUMMON_TIMED_DESPAWN, HOUR*IN_MILLISECONDS); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp index 525c7f48f1c..4416b40724a 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_magistrate_barthilas.cpp @@ -46,7 +46,7 @@ class boss_magistrate_barthilas : public CreatureScript public: boss_magistrate_barthilas() : CreatureScript("boss_magistrate_barthilas") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_magistrate_barthilasAI (creature); } @@ -61,7 +61,7 @@ public: uint32 FuriousAnger_Timer; uint32 AngerCount; - void Reset() + void Reset() OVERRIDE { DrainingBlow_Timer = 20000; CrowdPummel_Timer = 15000; @@ -75,23 +75,24 @@ public: me->SetDisplayId(MODEL_HUMAN); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { //nothing to see here yet ScriptedAI::MoveInLineOfSight(who); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { me->SetDisplayId(MODEL_HUMAN); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp index 82135d0cae9..a9a5ce53257 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_maleki_the_pallid.cpp @@ -41,7 +41,7 @@ class boss_maleki_the_pallid : public CreatureScript public: boss_maleki_the_pallid() : CreatureScript("boss_maleki_the_pallid") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_maleki_the_pallidAI (creature); } @@ -59,24 +59,24 @@ public: uint32 IceTomb_Timer; uint32 DrainLife_Timer; - void Reset() + void Reset() OVERRIDE { Frostbolt_Timer = 1000; IceTomb_Timer = 16000; DrainLife_Timer = 31000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(TYPE_PALLID, IN_PROGRESS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp index 51fa2418560..b14a60d77cc 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_nerubenkan.cpp @@ -40,7 +40,7 @@ class boss_nerubenkan : public CreatureScript public: boss_nerubenkan() : CreatureScript("boss_nerubenkan") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_nerubenkanAI (creature); } @@ -59,7 +59,7 @@ public: uint32 CryptScarabs_Timer; uint32 RaiseUndeadScarab_Timer; - void Reset() + void Reset() OVERRIDE { CryptScarabs_Timer = 3000; EncasingWebs_Timer = 7000; @@ -67,11 +67,11 @@ public: RaiseUndeadScarab_Timer = 3000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(TYPE_NERUB, IN_PROGRESS); @@ -84,7 +84,7 @@ public: pUndeadScarab->AI()->AttackStart(victim); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp index 7c6ea86dfa5..cd1ec45fe20 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_order_of_silver_hand.cpp @@ -56,7 +56,7 @@ class boss_silver_hand_bosses : public CreatureScript public: boss_silver_hand_bosses() : CreatureScript("boss_silver_hand_bosses") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_silver_hand_bossesAI (creature); } @@ -73,7 +73,7 @@ public: uint32 HolyLight_Timer; uint32 DivineShield_Timer; - void Reset() + void Reset() OVERRIDE { HolyLight_Timer = 20000; DivineShield_Timer = 20000; @@ -101,11 +101,11 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (!instance) return; @@ -136,7 +136,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/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp index 3d0eaba9022..5f169ece0d5 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_postmaster_malown.cpp @@ -61,9 +61,9 @@ class boss_postmaster_malown : public CreatureScript { boss_postmaster_malownAI(Creature* creature) : BossAI(creature, TYPE_MALOWN) {} - void Reset() {} + void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { events.ScheduleEvent(EVENT_WAILINGDEAD, 19000); // lasts 6 sec events.ScheduleEvent(EVENT_BACKHAND, 8000); // 2 sec stun @@ -72,12 +72,12 @@ class boss_postmaster_malown : public CreatureScript events.ScheduleEvent(EVENT_CALLOFTHEGRAVE, 25000); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -124,7 +124,7 @@ class boss_postmaster_malown : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_postmaster_malownAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp index 3d876671238..9e2c6834439 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_ramstein_the_gorger.cpp @@ -43,7 +43,7 @@ class boss_ramstein_the_gorger : public CreatureScript public: boss_ramstein_the_gorger() : CreatureScript("boss_ramstein_the_gorger") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_ramstein_the_gorgerAI (creature); } @@ -60,17 +60,17 @@ public: uint32 Trample_Timer; uint32 Knockout_Timer; - void Reset() + void Reset() OVERRIDE { Trample_Timer = 3000; Knockout_Timer = 12000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { for (uint8 i = 0; i < 30; ++i) { @@ -82,7 +82,7 @@ public: instance->SetData(TYPE_RAMSTEIN, DONE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp index df00dfcaa4f..931bb3f6b3b 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_timmy_the_cruel.cpp @@ -41,7 +41,7 @@ class boss_timmy_the_cruel : public CreatureScript public: boss_timmy_the_cruel() : CreatureScript("boss_timmy_the_cruel") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_timmy_the_cruelAI (creature); } @@ -53,13 +53,13 @@ public: uint32 RavenousClaw_Timer; bool HasYelled; - void Reset() + void Reset() OVERRIDE { RavenousClaw_Timer = 10000; HasYelled = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (!HasYelled) { @@ -68,7 +68,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/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp index 98ea4a19cbc..383b9307523 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp @@ -213,7 +213,7 @@ class instance_stratholme : public InstanceMapScript } } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -384,7 +384,7 @@ class instance_stratholme : public InstanceMapScript OUT_LOAD_INST_DATA_COMPLETE; } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -408,7 +408,7 @@ class instance_stratholme : public InstanceMapScript return 0; } - uint64 GetData64(uint32 data) const + uint64 GetData64(uint32 data) const OVERRIDE { switch (data) { @@ -451,7 +451,7 @@ class instance_stratholme : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_stratholme_InstanceMapScript(map); } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index 9b6ef8fb214..ceff3d583c7 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -46,7 +46,7 @@ class go_gauntlet_gate : public GameObjectScript public: go_gauntlet_gate() : GameObjectScript("go_gauntlet_gate") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { InstanceScript* instance = go->GetInstanceScript(); @@ -93,7 +93,7 @@ class npc_freed_soul : public CreatureScript public: npc_freed_soul() : CreatureScript("npc_freed_soul") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_freed_soulAI (creature); } @@ -102,12 +102,12 @@ public: { npc_freed_soulAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { Talk(SAY_ZAPPED); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} }; }; @@ -135,7 +135,7 @@ class npc_restless_soul : public CreatureScript public: npc_restless_soul() : CreatureScript("npc_restless_soul") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_restless_soulAI (creature); } @@ -148,16 +148,16 @@ public: uint32 Die_Timer; bool Tagged; - void Reset() + void Reset() OVERRIDE { Tagger = 0; Die_Timer = 5000; Tagged = false; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void SpellHit(Unit* caster, const SpellInfo* spell) + void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE { if (Tagged || spell->Id != SPELL_EGAN_BLASTER) return; @@ -170,18 +170,18 @@ public: Tagger = caster->GetGUID(); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->CastSpell(summoned, SPELL_SOUL_FREED, false); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Tagged) me->SummonCreature(NPC_FREED, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 300000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (Tagged) { @@ -217,7 +217,7 @@ class npc_spectral_ghostly_citizen : public CreatureScript public: npc_spectral_ghostly_citizen() : CreatureScript("npc_spectral_ghostly_citizen") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_spectral_ghostly_citizenAI (creature); } @@ -229,21 +229,21 @@ public: uint32 Die_Timer; bool Tagged; - void Reset() + void Reset() OVERRIDE { Die_Timer = 5000; Tagged = false; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE { if (!Tagged && spell->Id == SPELL_EGAN_BLASTER) Tagged = true; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Tagged) { @@ -256,7 +256,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (Tagged) { @@ -271,7 +271,7 @@ public: DoMeleeAttackIfReady(); } - void ReceiveEmote(Player* player, uint32 emote) + void ReceiveEmote(Player* player, uint32 emote) OVERRIDE { switch (emote) { diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp index ee0d9bb64f3..2239b4a6ed3 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp @@ -51,7 +51,7 @@ class instance_sunken_temple : public InstanceMapScript public: instance_sunken_temple() : InstanceMapScript("instance_sunken_temple", 109) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_sunken_temple_InstanceMapScript(map); } @@ -193,13 +193,13 @@ public: } */ - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { if (type == EVENT_STATE) State = data; } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == EVENT_STATE) return State; diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp index 027080404f6..ac0c3a556f3 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp @@ -41,7 +41,7 @@ class at_malfurion_stormrage : public AreaTriggerScript public: at_malfurion_stormrage() : AreaTriggerScript("at_malfurion_stormrage") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) OVERRIDE { if (player->GetInstanceScript() && !player->FindNearestCreature(15362, 15)) player->SummonCreature(15362, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), -1.52f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 100000); @@ -58,7 +58,7 @@ class go_atalai_statue : public GameObjectScript public: go_atalai_statue() : GameObjectScript("go_atalai_statue") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (InstanceScript* instance = player->GetInstanceScript()) instance->SetData(EVENT_STATE, go->GetEntry()); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index ca6464f2080..13be22cd3a1 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -68,7 +68,7 @@ class boss_brutallus : public CreatureScript public: boss_brutallus() : CreatureScript("boss_brutallus") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_brutallusAI (creature); } @@ -96,7 +96,7 @@ public: bool IsIntro; bool Enraged; - void Reset() + void Reset() OVERRIDE { SlashTimer = 11000; StompTimer = 30000; @@ -116,7 +116,7 @@ public: instance->SetData(DATA_BRUTALLUS_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(YELL_AGGRO); @@ -124,12 +124,12 @@ public: instance->SetData(DATA_BRUTALLUS_EVENT, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(YELL_KILL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(YELL_DEATH); @@ -142,7 +142,7 @@ public: } } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { if (!Intro) ScriptedAI::EnterEvadeMode(); @@ -179,7 +179,7 @@ public: IsIntro = false; } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who || Intro || IsIntro) return; @@ -264,7 +264,8 @@ public: } } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!me->IsValidAttackTarget(who)) return; @@ -277,7 +278,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (IsIntro) { diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index 31f93d70e00..c98443442e3 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -84,7 +84,7 @@ class boss_sacrolash : public CreatureScript public: boss_sacrolash() : CreatureScript("boss_sacrolash") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_sacrolashAI (creature); }; @@ -108,7 +108,7 @@ public: uint32 ConflagrationTimer; uint32 EnrageTimer; - void Reset() + void Reset() OVERRIDE { Enraged = false; @@ -139,7 +139,7 @@ public: instance->SetData(DATA_EREDAR_TWINS_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { DoZoneInCombat(); @@ -154,13 +154,13 @@ public: instance->SetData(DATA_EREDAR_TWINS_EVENT, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { if (rand()%4 == 0) Talk(YELL_SAC_KILL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { // only if ALY death if (SisterDeath) @@ -174,7 +174,7 @@ public: me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); } - void SpellHitTarget(Unit* target, const SpellInfo* spell) + void SpellHitTarget(Unit* target, const SpellInfo* spell) OVERRIDE { switch (spell->Id) { @@ -217,7 +217,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!SisterDeath) { @@ -340,7 +340,7 @@ class boss_alythess : public CreatureScript public: boss_alythess() : CreatureScript("boss_alythess") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_alythessAI (creature); }; @@ -370,7 +370,7 @@ public: uint32 FlamesearTimer; uint32 EnrageTimer; - void Reset() + void Reset() OVERRIDE { Enraged = false; @@ -402,7 +402,7 @@ public: instance->SetData(DATA_EREDAR_TWINS_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { DoZoneInCombat(); @@ -417,13 +417,14 @@ public: instance->SetData(DATA_EREDAR_TWINS_EVENT, IN_PROGRESS); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!me->IsInCombat()) ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!who || me->GetVictim()) return; @@ -445,7 +446,7 @@ public: } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { if (rand()%4 == 0) { @@ -453,7 +454,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (SisterDeath) { @@ -466,7 +467,7 @@ public: me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); } - void SpellHitTarget(Unit* target, const SpellInfo* spell) + void SpellHitTarget(Unit* target, const SpellInfo* spell) OVERRIDE { switch (spell->Id) { @@ -542,7 +543,7 @@ public: return 10000; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (IntroStepCounter < 9) { @@ -666,7 +667,7 @@ class npc_shadow_image : public CreatureScript public: npc_shadow_image() : CreatureScript("npc_shadow_image") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_shadow_imageAI (creature); }; @@ -679,7 +680,7 @@ public: uint32 KillTimer; uint32 DarkstrikeTimer; - void Reset() + void Reset() OVERRIDE { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); ShadowfuryTimer = 5000 + (rand()%15000); @@ -687,9 +688,9 @@ public: KillTimer = 15000; } - void EnterCombat(Unit* /*who*/){} + void EnterCombat(Unit* /*who*/)OVERRIDE {} - void SpellHitTarget(Unit* target, const SpellInfo* spell) + void SpellHitTarget(Unit* target, const SpellInfo* spell) OVERRIDE { switch (spell->Id) { @@ -707,7 +708,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!me->HasAura(SPELL_IMAGE_VISUAL)) DoCast(me, SPELL_IMAGE_VISUAL); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index e7bc4d18a95..a74e2cc87b1 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -112,7 +112,7 @@ class boss_felmyst : public CreatureScript public: boss_felmyst() : CreatureScript("boss_felmyst") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_felmystAI(creature); } @@ -133,7 +133,7 @@ public: float breathX, breathY; - void Reset() + void Reset() OVERRIDE { phase = PHASE_NONE; @@ -152,7 +152,7 @@ public: instance->SetData(DATA_FELMYST_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { events.ScheduleEvent(EVENT_BERSERK, 600000); @@ -166,29 +166,30 @@ public: instance->SetData(DATA_FELMYST_EVENT, IN_PROGRESS); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (phase != PHASE_FLIGHT) ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (phase != PHASE_FLIGHT) ScriptedAI::MoveInLineOfSight(who); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(YELL_KILL); } - void JustRespawned() + void JustRespawned() OVERRIDE { Talk(YELL_BIRTH); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(YELL_DEATH); @@ -196,7 +197,7 @@ public: instance->SetData(DATA_FELMYST_EVENT, DONE); } - void SpellHit(Unit* caster, const SpellInfo* spell) + void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE { // workaround for linked aura /*if (spell->Id == SPELL_VAPOR_FORCE) @@ -219,7 +220,7 @@ public: } } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { if (summon->GetEntry() == NPC_DEAD) { @@ -229,13 +230,13 @@ public: } } - void MovementInform(uint32, uint32) + void MovementInform(uint32, uint32) OVERRIDE { if (phase == PHASE_FLIGHT) events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 1); } - void DamageTaken(Unit*, uint32 &damage) + void DamageTaken(Unit*, uint32 &damage) OVERRIDE { if (phase != PHASE_GROUND && damage >= me->GetHealth()) damage = 0; @@ -404,7 +405,7 @@ public: ++uiFlightCount; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) { @@ -518,7 +519,7 @@ class npc_felmyst_vapor : public CreatureScript public: npc_felmyst_vapor() : CreatureScript("npc_felmyst_vapor") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_felmyst_vaporAI(creature); } @@ -530,13 +531,13 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetSpeed(MOVE_RUN, 0.8f); } - void Reset() {} - void EnterCombat(Unit* /*who*/) + void Reset() OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); //DoCast(me, SPELL_VAPOR_FORCE, true); core bug } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!me->GetVictim()) if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) @@ -550,7 +551,7 @@ class npc_felmyst_trail : public CreatureScript public: npc_felmyst_trail() : CreatureScript("npc_felmyst_trail") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_felmyst_trailAI(creature); } @@ -564,11 +565,12 @@ public: me->SetTarget(me->GetGUID()); me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 0.01f); // core bug } - 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 {} }; }; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index cce84e3714a..586009271ad 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -103,7 +103,7 @@ class boss_kalecgos : public CreatureScript public: boss_kalecgos() : CreatureScript("boss_kalecgos") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_kalecgosAI (creature); } @@ -139,7 +139,7 @@ public: uint64 SathGUID; uint64 DoorGUID; - void Reset() + void Reset() OVERRIDE { if (instance) { @@ -174,7 +174,7 @@ public: isBanished = false; } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { bJustReset = true; me->SetVisible(false); @@ -182,7 +182,7 @@ public: ScriptedAI::EnterEvadeMode(); } - void DoAction(int32 param) + void DoAction(int32 param) OVERRIDE { switch (param) { @@ -197,7 +197,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (TalkTimer) { @@ -330,7 +330,8 @@ public: } } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (bJustReset)//boss is invisible, don't attack return; @@ -343,13 +344,13 @@ public: } } - void DamageTaken(Unit* done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE { if (damage >= me->GetHealth() && done_by != me) damage = 0; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { me->SetStandState(UNIT_STAND_STATE_STAND); Talk(SAY_EVIL_AGGRO); @@ -359,12 +360,12 @@ public: instance->SetData(DATA_KALECGOS_EVENT, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_EVIL_SLAY); } - void MovementInform(uint32 type, uint32 /*id*/) + void MovementInform(uint32 type, uint32 /*id*/) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -441,7 +442,7 @@ class boss_kalec : public CreatureScript public: boss_kalec() : CreatureScript("boss_kalec") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_kalecAI (creature); } @@ -464,7 +465,7 @@ public: instance = creature->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { if (instance) SathGUID = instance->GetData64(DATA_SATHROVARR); @@ -477,7 +478,7 @@ public: isEnraged = false; } - void DamageTaken(Unit* done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE { if (done_by->GetGUID() != SathGUID) damage = 0; @@ -485,7 +486,7 @@ public: damage *= 3; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!me->HasAura(AURA_SPECTRAL_INVISIBILITY)) me->CastSpell(me, AURA_SPECTRAL_INVISIBILITY, true); @@ -542,7 +543,7 @@ class kalecgos_teleporter : public GameObjectScript public: kalecgos_teleporter() : GameObjectScript("kalecgos_teleporter") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { uint8 SpectralPlayers = 0; Map* map = go->GetMap(); @@ -569,7 +570,7 @@ class boss_sathrovarr : public CreatureScript public: boss_sathrovarr() : CreatureScript("boss_sathrovarr") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_sathrovarrAI (creature); } @@ -597,7 +598,7 @@ public: bool isEnraged; bool isBanished; - void Reset() + void Reset() OVERRIDE { me->SetFullHealth();//dunno why it does not resets health at evade.. me->setActive(true); @@ -625,7 +626,7 @@ public: TeleportAllPlayersBack(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (Creature* Kalec = me->SummonCreature(NPC_KALEC, me->GetPositionX() + 10, me->GetPositionY() + 5, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0)) { @@ -637,13 +638,13 @@ public: Talk(SAY_SATH_AGGRO); } - void DamageTaken(Unit* done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE { if (damage >= me->GetHealth() && done_by != me) damage = 0; } - void KilledUnit(Unit* target) + void KilledUnit(Unit* target) OVERRIDE { if (target->GetGUID() == KalecGUID) { @@ -659,7 +660,7 @@ public: Talk(SAY_SATH_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_SATH_DEATH); me->SetPosition(me->GetPositionX(), me->GetPositionY(), DRAGON_REALM_Z, me->GetOrientation()); @@ -691,7 +692,7 @@ public: } } - void DoAction(int32 param) + void DoAction(int32 param) OVERRIDE { switch (param) { @@ -706,7 +707,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!me->HasAura(AURA_SPECTRAL_INVISIBILITY)) me->CastSpell(me, AURA_SPECTRAL_INVISIBILITY, true); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index 9f4e8edc8cc..daee256d602 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -234,7 +234,7 @@ class boss_kalecgos_kj : public CreatureScript public: boss_kalecgos_kj() : CreatureScript("boss_kalecgos_kj") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_kalecgos_kjAI (creature); } @@ -250,7 +250,7 @@ public: uint8 OrbsEmpowered; uint8 EmpowerCount; - void Reset() + void Reset() OVERRIDE { OrbsEmpowered = 0; EmpowerCount = 0; @@ -335,7 +335,7 @@ public: } } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { } @@ -363,7 +363,7 @@ class go_orb_of_the_blue_flight : public GameObjectScript public: go_orb_of_the_blue_flight() : GameObjectScript("go_orb_of_the_blue_flight") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (go->GetUInt32Value(GAMEOBJECT_FACTION) == 35) { @@ -387,7 +387,7 @@ class npc_kiljaeden_controller : public CreatureScript public: npc_kiljaeden_controller() : CreatureScript("npc_kiljaeden_controller") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_kiljaeden_controllerAI (creature); } @@ -411,7 +411,7 @@ public: uint32 phase; uint8 deceiverDeathCount; - void InitializeAI() + void InitializeAI() OVERRIDE { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -420,7 +420,7 @@ public: ScriptedAI::InitializeAI(); } - void Reset() + void Reset() OVERRIDE { phase = PHASE_DECEIVERS; @@ -434,7 +434,7 @@ public: summons.DespawnAll(); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { switch (summoned->GetEntry()) { @@ -454,7 +454,7 @@ public: summons.Summon(summoned); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (uiRandomSayTimer < diff) { @@ -489,7 +489,7 @@ class boss_kiljaeden : public CreatureScript public: boss_kiljaeden() : CreatureScript("boss_kiljaeden") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_kiljaedenAI (creature); } @@ -522,12 +522,12 @@ public: bool OrbActivated; bool SpeechBegins; - void InitializeAI() + void InitializeAI() OVERRIDE { // Scripted_NoMovementAI::InitializeAI(); } - void Reset() + void Reset() OVERRIDE { TimerIsDeactivated[TIMER_SPEECH] = false; Timer[TIMER_SPEECH] = 0; @@ -588,7 +588,7 @@ public: TimerIsDeactivated[TIMER_SUMMON_SHILEDORB] = true; } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned->GetEntry() == CREATURE_ARMAGEDDON_TARGET) { @@ -603,7 +603,7 @@ public: summons.Summon(summoned); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_KJ_DEATH); summons.DespawnAll(); @@ -612,12 +612,12 @@ public: instance->SetData(DATA_KILJAEDEN_EVENT, DONE); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KJ_SLAY); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { ScriptedAI::EnterEvadeMode(); @@ -631,7 +631,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); } @@ -666,7 +666,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || Phase < PHASE_NORMAL) return; @@ -899,7 +899,7 @@ class npc_hand_of_the_deceiver : public CreatureScript public: npc_hand_of_the_deceiver() : CreatureScript("npc_hand_of_the_deceiver") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_hand_of_the_deceiverAI (creature); } @@ -916,7 +916,7 @@ public: uint32 ShadowBoltVolleyTimer; uint32 FelfirePortalTimer; - void Reset() + void Reset() OVERRIDE { /// @todo Timers! ShadowBoltVolleyTimer = urand(8000, 14000); // So they don't all cast it in the same moment. @@ -925,13 +925,13 @@ public: instance->SetData(DATA_KILJAEDEN_EVENT, NOT_STARTED); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->setFaction(me->getFaction()); summoned->SetLevel(me->getLevel()); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (instance) { @@ -942,7 +942,7 @@ public: me->InterruptNonMeleeSpells(true); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (!instance) return; @@ -951,7 +951,7 @@ public: ++(CAST_AI(npc_kiljaeden_controller::npc_kiljaeden_controllerAI, pControl->AI())->deceiverDeathCount); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!me->IsInCombat()) DoCast(me, SPELL_SHADOW_CHANNELING); @@ -999,7 +999,7 @@ class npc_felfire_portal : public CreatureScript public: npc_felfire_portal() : CreatureScript("npc_felfire_portal") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_felfire_portalAI (creature); } @@ -1013,19 +1013,19 @@ public: uint32 uiSpawnFiendTimer; - void Reset() + void Reset() OVERRIDE { uiSpawnFiendTimer = 5000; me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_NON_ATTACKABLE); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->setFaction(me->getFaction()); summoned->SetLevel(me->getLevel()); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1046,7 +1046,7 @@ class npc_volatile_felfire_fiend : public CreatureScript public: npc_volatile_felfire_fiend() : CreatureScript("npc_volatile_felfire_fiend") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_volatile_felfire_fiendAI (creature); } @@ -1059,19 +1059,19 @@ public: bool bLockedTarget; - void Reset() + void Reset() OVERRIDE { uiExplodeTimer = 2000; bLockedTarget = false; } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { if (damage > me->GetHealth()) DoCast(me, SPELL_FELFIRE_FISSION, true); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1103,7 +1103,7 @@ class npc_armageddon : public CreatureScript public: npc_armageddon() : CreatureScript("npc_armageddon") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_armageddonAI (creature); } @@ -1118,13 +1118,13 @@ public: uint8 spell; uint32 uiTimer; - void Reset() + void Reset() OVERRIDE { spell = 0; uiTimer = 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (uiTimer <= diff) { @@ -1160,7 +1160,7 @@ class npc_shield_orb : public CreatureScript public: npc_shield_orb() : CreatureScript("npc_shield_orb") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_shield_orbAI (creature); } @@ -1180,7 +1180,7 @@ public: uint32 uiCheckTimer; float x, y, r, c, mx, my; - void Reset() + void Reset() OVERRIDE { me->SetDisableGravity(true); bPointReached = true; @@ -1193,7 +1193,7 @@ public: bClockwise = urand(0, 1); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (bPointReached) { @@ -1231,7 +1231,7 @@ public: } else uiTimer -= diff; } - void MovementInform(uint32 type, uint32 /*id*/) + void MovementInform(uint32 type, uint32 /*id*/) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -1247,7 +1247,7 @@ class npc_sinster_reflection : public CreatureScript public: npc_sinster_reflection() : CreatureScript("npc_sinster_reflection") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_sinster_reflectionAI (creature); } @@ -1259,7 +1259,7 @@ public: uint8 victimClass; uint32 uiTimer[3]; - void Reset() + void Reset() OVERRIDE { uiTimer[0] = 0; uiTimer[1] = 0; @@ -1267,7 +1267,7 @@ public: victimClass = 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index dd5edc969b7..45f2ae00697 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -109,7 +109,7 @@ class boss_entropius : public CreatureScript public: boss_entropius() : CreatureScript("boss_entropius") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_entropiusAI (creature); } @@ -126,7 +126,7 @@ public: uint32 BlackHoleSummonTimer; - void Reset() + void Reset() OVERRIDE { BlackHoleSummonTimer = 15000; DoCastAOE(SPELL_NEGATIVE_ENERGY_E, false); @@ -137,7 +137,7 @@ public: instance->SetData(DATA_MURU_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoCastAOE(SPELL_NEGATIVE_ENERGY_E, true); DoCast(me, SPELL_ENTROPIUS_SPAWN, false); @@ -146,7 +146,7 @@ public: instance->SetData(DATA_MURU_EVENT, IN_PROGRESS); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { switch (summoned->GetEntry()) { @@ -164,7 +164,7 @@ public: Summons.Summon(summoned); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Summons.DespawnAll(); @@ -172,7 +172,7 @@ public: instance->SetData(DATA_MURU_EVENT, DONE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -208,7 +208,7 @@ class boss_muru : public CreatureScript public: boss_muru() : CreatureScript("boss_muru") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_muruAI (creature); } @@ -229,7 +229,7 @@ public: bool DarkFiend; - void Reset() + void Reset() OVERRIDE { DarkFiend = false; Phase = 1; @@ -249,7 +249,7 @@ public: instance->SetData(DATA_MURU_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoCastAOE(SPELL_NEGATIVE_ENERGY, false); @@ -257,7 +257,7 @@ public: instance->SetData(DATA_MURU_EVENT, IN_PROGRESS); } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { if (damage > me->GetHealth() && Phase == 1) { @@ -271,7 +271,7 @@ public: damage = 0; } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { switch (summoned->GetEntry()) { @@ -286,7 +286,7 @@ public: Summons.Summon(summoned); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -373,7 +373,7 @@ class npc_muru_portal : public CreatureScript public: npc_muru_portal() : CreatureScript("npc_muru_portal") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_muru_portalAI (creature); } @@ -395,7 +395,7 @@ public: uint32 SummonTimer; - void Reset() + void Reset() OVERRIDE { SummonTimer = 5000; @@ -407,7 +407,7 @@ public: Summons.DespawnAll(); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (instance) if (Player* Target = Unit::GetPlayer(*me, instance->GetData64(DATA_PLAYER_GUID))) @@ -416,7 +416,7 @@ public: Summons.Summon(summoned); } - void SpellHit(Unit* /*caster*/, const SpellInfo* Spell) + void SpellHit(Unit* /*caster*/, const SpellInfo* Spell) OVERRIDE { float x, y, z, o; me->GetHomePosition(x, y, z, o); @@ -434,7 +434,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!SummonSentinel) { @@ -457,7 +457,7 @@ class npc_dark_fiend : public CreatureScript public: npc_dark_fiend() : CreatureScript("npc_dark_fiend") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_dark_fiendAI (creature); } @@ -469,7 +469,7 @@ public: uint32 WaitTimer; bool InAction; - void Reset() + void Reset() OVERRIDE { WaitTimer = 2000; InAction = false; @@ -477,14 +477,14 @@ public: me->AddUnitState(UNIT_STATE_STUNNED); } - void SpellHit(Unit* /*caster*/, const SpellInfo* Spell) + void SpellHit(Unit* /*caster*/, const SpellInfo* Spell) OVERRIDE { for (uint8 i = 0; i < 3; ++i) if (Spell->Effects[i].Effect == 38) me->DisappearAndDie(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -518,7 +518,7 @@ class npc_void_sentinel : public CreatureScript public: npc_void_sentinel() : CreatureScript("npc_void_sentinel") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_void_sentinelAI (creature); } @@ -530,7 +530,7 @@ public: uint32 PulseTimer; uint32 VoidBlastTimer; - void Reset() + void Reset() OVERRIDE { PulseTimer = 3000; VoidBlastTimer = 45000; //is this a correct timer? @@ -540,13 +540,13 @@ public: DoTeleportTo(x, y, 71); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { for (uint8 i = 0; i < 8; ++i) me->SummonCreature(CREATURE_VOID_SPAWN, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), float(rand()%6), TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 180000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -573,7 +573,7 @@ class npc_blackhole : public CreatureScript public: npc_blackhole() : CreatureScript("npc_blackhole") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_blackholeAI (creature); } @@ -592,7 +592,7 @@ public: uint8 Phase; uint8 NeedForAHack; - void Reset() + void Reset() OVERRIDE { DespawnTimer = 15000; SpellTimer = 5000; @@ -602,7 +602,7 @@ public: DoCastAOE(SPELL_BLACKHOLE_SPAWN, true); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (SpellTimer <= diff) { diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp index 050275bc94c..ac5adde9e73 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp @@ -44,7 +44,7 @@ class instance_sunwell_plateau : public InstanceMapScript public: instance_sunwell_plateau() : InstanceMapScript("instance_sunwell_plateau", 580) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_sunwell_plateau_InstanceMapScript(map); } @@ -182,7 +182,7 @@ public: } } - uint32 GetData(uint32 id) const + uint32 GetData(uint32 id) const OVERRIDE { switch (id) { @@ -196,7 +196,7 @@ public: return 0; } - uint64 GetData64(uint32 id) const + uint64 GetData64(uint32 id) const OVERRIDE { switch (id) { @@ -221,7 +221,7 @@ public: return 0; } - void SetData(uint32 id, uint32 data) + void SetData(uint32 id, uint32 data) OVERRIDE { switch (id) { diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp index ed7332510fc..69ee53f0762 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp @@ -76,7 +76,7 @@ class boss_archaedas : public CreatureScript bool bVaultWalkersAwake; InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiTremorTimer = 60000; iAwakenTimer = 0; @@ -107,14 +107,14 @@ class boss_archaedas : public CreatureScript } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { me->setFaction(14); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE { // Being woken up from the altar, start the awaken sequence if (spell == sSpellMgr->GetSpellInfo(SPELL_ARCHAEDAS_AWAKEN)) @@ -125,12 +125,12 @@ class boss_archaedas : public CreatureScript } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (!instance) return; @@ -204,7 +204,7 @@ class boss_archaedas : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_archaedasAI(creature); } @@ -240,7 +240,7 @@ class npc_archaedas_minions : public CreatureScript bool bAmIAwake; InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiArcing_Timer = 3000; iAwakenTimer = 0; @@ -254,7 +254,7 @@ class npc_archaedas_minions : public CreatureScript me->RemoveAllAuras(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { me->setFaction (14); me->RemoveAllAuras(); @@ -263,7 +263,8 @@ class npc_archaedas_minions : public CreatureScript bAmIAwake = true; } - void SpellHit (Unit* /*caster*/, const SpellInfo* spell) { + void SpellHit(Unit * /*caster*/, const SpellInfo* spell) OVERRIDE + { // time to wake up, start animation if (spell == sSpellMgr->GetSpellInfo(SPELL_ARCHAEDAS_AWAKEN)) { @@ -272,13 +273,14 @@ class npc_archaedas_minions : public CreatureScript } } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (bAmIAwake) ScriptedAI::MoveInLineOfSight(who); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { // we're still in the awaken animation if (bWakingUp && iAwakenTimer >= 0) @@ -301,7 +303,7 @@ class npc_archaedas_minions : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_archaedas_minionsAI(creature); } @@ -332,7 +334,7 @@ class npc_stonekeepers : public CreatureScript InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { me->setFaction(35); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -340,14 +342,14 @@ class npc_stonekeepers : public CreatureScript me->RemoveAllAuras(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { me->setFaction(14); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -356,7 +358,7 @@ class npc_stonekeepers : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*attacker*/) + void JustDied(Unit* /*attacker*/) OVERRIDE { DoCast (me, SPELL_SELF_DESTRUCT, true); if (instance) @@ -364,7 +366,7 @@ class npc_stonekeepers : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_stonekeepersAI(creature); } @@ -386,7 +388,7 @@ class go_altar_of_archaedas : public GameObjectScript { } - bool OnGossipHello(Player* player, GameObject* /*go*/) + bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE { InstanceScript* instance = player->GetInstanceScript(); if (!instance) diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp index 7d745d4f89a..1a41becfad5 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp @@ -51,19 +51,19 @@ class boss_ironaya : public CreatureScript bool bHasCastedWstomp; bool bHasCastedKnockaway; - void Reset() + void Reset() OVERRIDE { uiArcingTimer = 3000; bHasCastedKnockaway = false; bHasCastedWstomp = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -104,7 +104,7 @@ class boss_ironaya : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_ironayaAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index b16893df157..7da755b5313 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -327,7 +327,7 @@ class instance_uldaman : public InstanceMapScript ironayaSealDoorTimer -= diff; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -393,7 +393,7 @@ class instance_uldaman : public InstanceMapScript } } - void SetData64(uint32 type, uint64 data) + void SetData64(uint32 type, uint64 data) OVERRIDE { // Archaedas if (type == 0) @@ -469,7 +469,7 @@ class instance_uldaman : public InstanceMapScript } } - uint64 GetData64(uint32 identifier) const + uint64 GetData64(uint32 identifier) const OVERRIDE { switch (identifier) { @@ -507,7 +507,7 @@ class instance_uldaman : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_uldaman_InstanceMapScript(map); } diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp index a58a292373f..4dcb6af2392 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp @@ -58,16 +58,16 @@ class npc_jadespine_basilisk : public CreatureScript uint32 uiCslumberTimer; - void Reset() + void Reset() OVERRIDE { uiCslumberTimer = 2000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -96,7 +96,7 @@ class npc_jadespine_basilisk : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_jadespine_basiliskAI(creature); } @@ -111,7 +111,7 @@ class go_keystone_chamber : public GameObjectScript public: go_keystone_chamber() : GameObjectScript("go_keystone_chamber") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE { if (InstanceScript* instance = go->GetInstanceScript()) instance->SetData(DATA_IRONAYA_SEAL, IN_PROGRESS); //door animation and save state. @@ -135,7 +135,7 @@ class AreaTrigger_at_map_chamber : public AreaTriggerScript { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) + bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) OVERRIDE { if (player->GetQuestStatus(QUEST_HIDDEN_CHAMBER) == QUEST_STATUS_INCOMPLETE) player->AreaExploredOrEventHappens(QUEST_HIDDEN_CHAMBER); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index d4769d48efe..92caaa04aec 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -91,7 +91,7 @@ class boss_akilzon : public CreatureScript memset(BirdGUIDs, 0, sizeof(BirdGUIDs)); } - void Reset() + void Reset() OVERRIDE { _Reset(); @@ -105,7 +105,7 @@ class boss_akilzon : public CreatureScript SetWeather(WEATHER_STATE_FINE, 0.0f); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { events.ScheduleEvent(EVENT_STATIC_DISRUPTION, urand(10000, 20000)); // 10 to 20 seconds (bosskillers) events.ScheduleEvent(EVENT_GUST_OF_WIND, urand(20000, 30000)); // 20 to 30 seconds(bosskillers) @@ -120,13 +120,13 @@ class boss_akilzon : public CreatureScript instance->SetData(DATA_AKILZONEVENT, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); _JustDied(); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } @@ -214,7 +214,7 @@ class boss_akilzon : public CreatureScript events.ScheduleEvent(EVENT_STORM_SEQUENCE, 1000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -357,7 +357,7 @@ class boss_akilzon : public CreatureScript bool isRaining; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_akilzonAI(creature); } @@ -376,7 +376,7 @@ class npc_akilzon_eagle : public CreatureScript bool arrived; uint64 TargetGUID; - void Reset() + void Reset() OVERRIDE { EagleSwoop_Timer = urand(5000, 10000); arrived = true; @@ -384,14 +384,15 @@ class npc_akilzon_eagle : public CreatureScript me->SetDisableGravity(true); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); } - void MoveInLineOfSight(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void MovementInform(uint32, uint32) + + void MovementInform(uint32, uint32) OVERRIDE { arrived = true; if (TargetGUID) @@ -404,7 +405,7 @@ class npc_akilzon_eagle : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (EagleSwoop_Timer <= diff) EagleSwoop_Timer = 0; @@ -438,7 +439,7 @@ class npc_akilzon_eagle : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_akilzon_eagleAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp index dd75b80488b..8bfe45a7f17 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp @@ -109,7 +109,7 @@ class boss_halazzi : public CreatureScript uint64 LynxGUID; - void Reset() + void Reset() OVERRIDE { if (instance) instance->SetData(DATA_HALAZZIEVENT, NOT_STARTED); @@ -125,7 +125,7 @@ class boss_halazzi : public CreatureScript EnterPhase(PHASE_LYNX); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) instance->SetData(DATA_HALAZZIEVENT, IN_PROGRESS); @@ -136,26 +136,26 @@ class boss_halazzi : public CreatureScript EnterPhase(PHASE_LYNX); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { summon->AI()->AttackStart(me->GetVictim()); if (summon->GetEntry() == NPC_SPIRIT_LYNX) LynxGUID = summon->GetGUID(); } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { if (damage >= me->GetHealth() && Phase != PHASE_ENRAGE) damage = 0; } - void SpellHit(Unit*, const SpellInfo* spell) + void SpellHit(Unit*, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_TRANSFORM_SPLIT2) EnterPhase(PHASE_HUMAN); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (Phase != PHASE_MERGE) ScriptedAI::AttackStart(who); } @@ -213,7 +213,7 @@ class boss_halazzi : public CreatureScript Phase = NextPhase; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -315,7 +315,7 @@ class boss_halazzi : public CreatureScript DoMeleeAttackIfReady(); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { switch (urand(0, 1)) { @@ -331,7 +331,7 @@ class boss_halazzi : public CreatureScript } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_HALAZZIEVENT, DONE); @@ -341,7 +341,7 @@ class boss_halazzi : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_halazziAI(creature); } @@ -364,27 +364,27 @@ class npc_halazzi_lynx : public CreatureScript uint32 FrenzyTimer; uint32 shredder_timer; - void Reset() + void Reset() OVERRIDE { FrenzyTimer = urand(30000, 50000); //frenzy every 30-50 seconds shredder_timer = 4000; } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { if (damage >= me->GetHealth()) damage = 0; } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) ScriptedAI::AttackStart(who); } - void EnterCombat(Unit* /*who*/) {/*DoZoneInCombat();*/} + void EnterCombat(Unit* /*who*/) OVERRIDE {/*DoZoneInCombat();*/ } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -406,7 +406,7 @@ class npc_halazzi_lynx : public CreatureScript }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_halazzi_lynxAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index 6851a39cdb6..8a13e072be8 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -222,14 +222,14 @@ struct boss_hexlord_addAI : public ScriptedAI instance = creature->GetInstanceScript(); } - void Reset() {} + void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (instance && instance->GetData(DATA_HEXLORDEVENT) != IN_PROGRESS) { @@ -276,7 +276,7 @@ class boss_hexlord_malacrass : public CreatureScript uint32 PlayerClass; - void Reset() + void Reset() OVERRIDE { if (instance) instance->SetData(DATA_HEXLORDEVENT, NOT_STARTED); @@ -294,7 +294,7 @@ class boss_hexlord_malacrass : public CreatureScript me->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) instance->SetData(DATA_HEXLORDEVENT, IN_PROGRESS); @@ -316,7 +316,7 @@ class boss_hexlord_malacrass : public CreatureScript } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { switch (urand(0, 1)) { @@ -331,7 +331,7 @@ class boss_hexlord_malacrass : public CreatureScript } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_HEXLORDEVENT, DONE); @@ -382,7 +382,7 @@ class boss_hexlord_malacrass : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -508,7 +508,7 @@ class boss_hexlord_malacrass : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_hex_lord_malacrassAI(creature); } @@ -531,7 +531,7 @@ class boss_thurg : public CreatureScript uint32 bloodlust_timer; uint32 cleave_timer; - void Reset() + void Reset() OVERRIDE { bloodlust_timer = 15000; cleave_timer = 10000; @@ -539,7 +539,7 @@ class boss_thurg : public CreatureScript boss_hexlord_addAI::Reset(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -565,7 +565,7 @@ class boss_thurg : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_thurgAI(creature); } @@ -588,7 +588,7 @@ class boss_alyson_antille : public CreatureScript uint32 flashheal_timer; uint32 dispelmagic_timer; - void Reset() + void Reset() OVERRIDE { flashheal_timer = 2500; dispelmagic_timer = 10000; @@ -598,7 +598,7 @@ class boss_alyson_antille : public CreatureScript boss_hexlord_addAI::Reset(); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who) return; @@ -613,7 +613,7 @@ class boss_alyson_antille : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -662,7 +662,7 @@ class boss_alyson_antille : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_alyson_antilleAI(creature); } @@ -674,13 +674,13 @@ struct boss_gazakrothAI : public boss_hexlord_addAI uint32 firebolt_timer; - void Reset() + void Reset() OVERRIDE { firebolt_timer = 2000; boss_hexlord_addAI::Reset(); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who) return; @@ -695,7 +695,7 @@ struct boss_gazakrothAI : public boss_hexlord_addAI } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -726,7 +726,7 @@ class boss_lord_raadan : public CreatureScript uint32 flamebreath_timer; uint32 thunderclap_timer; - void Reset() + void Reset() OVERRIDE { flamebreath_timer = 8000; thunderclap_timer = 13000; @@ -734,7 +734,7 @@ class boss_lord_raadan : public CreatureScript boss_hexlord_addAI::Reset(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -755,7 +755,7 @@ class boss_lord_raadan : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_lord_raadanAI(creature); } @@ -776,12 +776,12 @@ class boss_darkheart : public CreatureScript uint32 psychicwail_timer; - void Reset() + void Reset() OVERRIDE { psychicwail_timer = 8000; boss_hexlord_addAI::Reset(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -796,7 +796,7 @@ class boss_darkheart : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_darkheartAI(creature); } @@ -818,13 +818,13 @@ class boss_slither : public CreatureScript uint32 venomspit_timer; - void Reset() + void Reset() OVERRIDE { venomspit_timer = 5000; boss_hexlord_addAI::Reset(); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who) return; @@ -839,7 +839,7 @@ class boss_slither : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -855,7 +855,7 @@ class boss_slither : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_slitherAI(creature); } @@ -876,13 +876,13 @@ class boss_fenstalker : public CreatureScript uint32 volatileinf_timer; - void Reset() + void Reset() OVERRIDE { volatileinf_timer = 15000; boss_hexlord_addAI::Reset(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -898,7 +898,7 @@ class boss_fenstalker : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_fenstalkerAI(creature); } @@ -920,14 +920,14 @@ class boss_koragg : public CreatureScript uint32 coldstare_timer; uint32 mightyblow_timer; - void Reset() + void Reset() OVERRIDE { coldstare_timer = 15000; mightyblow_timer = 10000; boss_hexlord_addAI::Reset(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -948,7 +948,7 @@ class boss_koragg : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_koraggAI(creature); } @@ -963,7 +963,7 @@ class spell_hexlord_unstable_affliction : public SpellScriptLoader { PrepareAuraScript(spell_hexlord_unstable_affliction_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WL_UNSTABLE_AFFL_DISPEL)) return false; @@ -976,13 +976,13 @@ class spell_hexlord_unstable_affliction : public SpellScriptLoader caster->CastSpell(dispelInfo->GetDispeller(), SPELL_WL_UNSTABLE_AFFL_DISPEL, true, NULL, GetEffect(EFFECT_0)); } - void Register() + void Register() OVERRIDE { AfterDispel += AuraDispelFn(spell_hexlord_unstable_affliction_AuraScript::HandleDispel); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_hexlord_unstable_affliction_AuraScript(); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index c69f0885164..329034a7682 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -141,7 +141,7 @@ class boss_janalai : public CreatureScript uint64 FireBombGUIDs[40]; - void Reset() + void Reset() OVERRIDE { if (instance) instance->SetData(DATA_JANALAIEVENT, NOT_STARTED); @@ -165,7 +165,7 @@ class boss_janalai : public CreatureScript HatchAllEggs(1); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -173,12 +173,12 @@ class boss_janalai : public CreatureScript instance->SetData(DATA_JANALAIEVENT, DONE); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) instance->SetData(DATA_JANALAIEVENT, IN_PROGRESS); @@ -187,7 +187,7 @@ class boss_janalai : public CreatureScript // DoZoneInCombat(); } - void DamageDealt(Unit* target, uint32 &damage, DamageEffectType /*damagetype*/) + void DamageDealt(Unit* target, uint32 &damage, DamageEffectType /*damagetype*/) OVERRIDE { if (isFlameBreathing) { @@ -320,7 +320,7 @@ class boss_janalai : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (isFlameBreathing) { @@ -440,7 +440,7 @@ class boss_janalai : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_janalaiAI(creature); } @@ -459,24 +459,25 @@ class npc_janalai_firebomb : public CreatureScript { npc_janalai_firebombAI(Creature* creature) : ScriptedAI(creature){} - void Reset() {} + void Reset() OVERRIDE {} - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_FIRE_BOMB_THROW) DoCast(me, SPELL_FIRE_BOMB_DUMMY, true); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void AttackStart(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 /*diff*/) {} + + void UpdateAI(uint32 /*diff*/) OVERRIDE {} }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_janalai_firebombAI(creature); } @@ -508,7 +509,7 @@ class npc_janalai_hatcher : public CreatureScript bool hasChangedSide; bool isHatching; - void Reset() + void Reset() OVERRIDE { me->SetWalk(true); side =(me->GetPositionY() < 1150); @@ -550,10 +551,11 @@ class npc_janalai_hatcher : public CreatureScript return num == 0; // if num == 0, no more templist } - void EnterCombat(Unit* /*who*/) {} - void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} - void MovementInform(uint32, uint32) + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void AttackStart(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + + void MovementInform(uint32, uint32) OVERRIDE { if (waypoint == 5) { @@ -565,7 +567,7 @@ class npc_janalai_hatcher : public CreatureScript WaitTimer = 1; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!instance || !(instance->GetData(DATA_JANALAIEVENT) == IN_PROGRESS)) { @@ -608,7 +610,7 @@ class npc_janalai_hatcher : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_janalai_hatcherAI(creature); } @@ -633,7 +635,7 @@ class npc_janalai_hatchling : public CreatureScript InstanceScript* instance; uint32 BuffetTimer; - void Reset() + void Reset() OVERRIDE { BuffetTimer = 7000; if (me->GetPositionY() > 1150) @@ -644,9 +646,9 @@ class npc_janalai_hatchling : public CreatureScript me->SetDisableGravity(true); } - void EnterCombat(Unit* /*who*/) {/*DoZoneInCombat();*/} + void EnterCombat(Unit* /*who*/) OVERRIDE {/*DoZoneInCombat();*/ } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!instance || !(instance->GetData(DATA_JANALAIEVENT) == IN_PROGRESS)) { @@ -667,7 +669,7 @@ class npc_janalai_hatchling : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_janalai_hatchlingAI(creature); } @@ -678,7 +680,7 @@ class npc_janalai_egg : public CreatureScript public: npc_janalai_egg(): CreatureScript("npc_janalai_egg") {} - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_janalai_eggAI(creature); } @@ -687,11 +689,11 @@ public: { npc_janalai_eggAI(Creature* creature) : ScriptedAI(creature){} - void Reset() {} + void Reset() OVERRIDE {} - void UpdateAI(uint32 /*diff*/) {} + void UpdateAI(uint32 /*diff*/) OVERRIDE {} - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_HATCH_EGG) { diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index f8c04acac4f..24b043775b1 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -133,7 +133,7 @@ class boss_nalorakk : public CreatureScript uint32 MovePhase; uint32 waitTimer; - void Reset() + void Reset() OVERRIDE { if (MoveEvent) { @@ -193,13 +193,14 @@ class boss_nalorakk : public CreatureScript } } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!MoveEvent) ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!MoveEvent) { @@ -272,7 +273,7 @@ class boss_nalorakk : public CreatureScript } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) instance->SetData(DATA_NALORAKKEVENT, IN_PROGRESS); @@ -282,7 +283,7 @@ class boss_nalorakk : public CreatureScript DoZoneInCombat(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_NALORAKKEVENT, DONE); @@ -291,7 +292,7 @@ class boss_nalorakk : public CreatureScript DoPlaySoundToSet(me, SOUND_YELL_DEATH); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { switch (urand(0, 1)) { @@ -306,7 +307,7 @@ class boss_nalorakk : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (MoveEvent) { @@ -346,7 +347,7 @@ class boss_nalorakk : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (waitTimer && inMove) { @@ -450,7 +451,7 @@ class boss_nalorakk : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_nalorakkAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp index 49df46df95c..11b18e9e5cc 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp @@ -167,7 +167,7 @@ class boss_zuljin : public CreatureScript SummonList Summons; - void Reset() + void Reset() OVERRIDE { if (instance) instance->SetData(DATA_ZULJINEVENT, NOT_STARTED); @@ -204,7 +204,7 @@ class boss_zuljin : public CreatureScript //me->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) instance->SetData(DATA_ZULJINEVENT, IN_PROGRESS); @@ -216,7 +216,7 @@ class boss_zuljin : public CreatureScript EnterPhase(0); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { if (Intro_Timer) return; @@ -224,7 +224,7 @@ class boss_zuljin : public CreatureScript Talk(YELL_KILL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_ZULJINEVENT, DONE); @@ -236,7 +236,7 @@ class boss_zuljin : public CreatureScript Temp->SetUInt32Value(UNIT_FIELD_BYTES_1, UNIT_STAND_STATE_DEAD); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (Phase == 2) AttackStartNoMove(who); @@ -297,12 +297,12 @@ class boss_zuljin : public CreatureScript } } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { Summons.Summon(summon); } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { Summons.Despawn(summon); } @@ -363,7 +363,7 @@ class boss_zuljin : public CreatureScript Phase = NextPhase; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!TankGUID) { @@ -553,7 +553,7 @@ class boss_zuljin : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_zuljinAI(creature); } @@ -572,17 +572,17 @@ class npc_zuljin_vortex : public CreatureScript { npc_zuljin_vortexAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() {} + void Reset() OVERRIDE {} - void EnterCombat(Unit* /*target*/) {} + void EnterCombat(Unit* /*target*/) OVERRIDE {} - void SpellHit(Unit* caster, const SpellInfo* spell) + void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_ZAP_INFORM) DoCast(caster, SPELL_ZAP_DAMAGE, true); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { //if the vortex reach the target, it change his target to another player if (me->IsWithinMeleeRange(me->GetVictim())) @@ -590,7 +590,7 @@ class npc_zuljin_vortex : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_zuljin_vortexAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp index c8409805a36..8068238b12e 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp @@ -231,7 +231,7 @@ class instance_zulaman : public InstanceMapScript } else TC_LOG_ERROR(LOG_FILTER_TSCR, "Zul'aman: corrupted save data."); } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -313,7 +313,7 @@ class instance_zulaman : public InstanceMapScript } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -350,7 +350,7 @@ class instance_zulaman : public InstanceMapScript } } - uint64 GetData64(uint32 type) const + uint64 GetData64(uint32 type) const OVERRIDE { switch (type) { @@ -365,7 +365,7 @@ class instance_zulaman : public InstanceMapScript }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_zulaman_InstanceMapScript(map); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index f466773af13..de9dd907bc9 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -68,9 +68,9 @@ class npc_forest_frog : public CreatureScript InstanceScript* instance; - void Reset() {} + void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} void DoSpawnRandom() { @@ -103,7 +103,7 @@ class npc_forest_frog : public CreatureScript } } - void SpellHit(Unit* caster, const SpellInfo* spell) + void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_REMOVE_AMANI_CURSE && caster->GetTypeId() == TYPEID_PLAYER && me->GetEntry() == NPC_FOREST_FROG) { @@ -114,7 +114,7 @@ class npc_forest_frog : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_forest_frogAI(creature); } @@ -144,37 +144,37 @@ class npc_zulaman_hostage : public CreatureScript bool IsLoot; uint64 PlayerGUID; - void Reset() {} + void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Player* player = Unit::GetPlayer(*me, PlayerGUID); if (player) player->SendLoot(me->GetGUID(), LOOT_CORPSE); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (IsLoot) DoCast(me, 7, false); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_zulaman_hostageAI(creature); } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HOSTAGE1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); 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(); @@ -290,16 +290,16 @@ class npc_harrison_jones : public CreatureScript uint32 _gongTimer; uint64 uiTargetGUID; - void Reset() + void Reset() OVERRIDE { _gongEvent = 0; _gongTimer = 0; uiTargetGUID = 0; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void sGossipSelect(Player* player, uint32 sender, uint32 action) + void sGossipSelect(Player* player, uint32 sender, uint32 action) OVERRIDE { if (me->GetCreatureTemplate()->GossipMenuId == sender && !action) { @@ -312,7 +312,7 @@ class npc_harrison_jones : public CreatureScript } } - void SpellHit(Unit*, const SpellInfo* spell) + void SpellHit(Unit*, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_COSMETIC_SPEAR_THROW) { @@ -327,7 +327,7 @@ class npc_harrison_jones : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (_gongEvent) { @@ -456,7 +456,7 @@ class npc_harrison_jones : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_harrison_jonesAI(creature); } @@ -477,13 +477,13 @@ class spell_banging_the_gong : public SpellScriptLoader GetHitGObj()->SendCustomAnim(0); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_banging_the_gong_SpellScript::Activate, EFFECT_1, SPELL_EFFECT_ACTIVATE_OBJECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_banging_the_gong_SpellScript(); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp index 7101ad4239f..2c48d18d112 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp @@ -94,7 +94,7 @@ class boss_arlokk : public CreatureScript { boss_arlokkAI(Creature* creature) : BossAI(creature, DATA_ARLOKK) { } - void Reset() + void Reset() OVERRIDE { _summonCountA = 0; _summonCountB = 0; @@ -110,7 +110,7 @@ class boss_arlokk : public CreatureScript } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); me->RemoveAllAuras(); @@ -122,7 +122,7 @@ class boss_arlokk : public CreatureScript } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, urand(7000, 9000), 0, PHASE_ONE); @@ -159,7 +159,7 @@ class boss_arlokk : public CreatureScript } } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { if (instance) { @@ -172,7 +172,7 @@ class boss_arlokk : public CreatureScript me->DespawnOrUnsummon(4000); } - void SetData(uint32 id, uint32 /*value*/) + void SetData(uint32 id, uint32 /*value*/) OVERRIDE { if (id == 1) --_summonCountA; @@ -180,7 +180,7 @@ class boss_arlokk : public CreatureScript --_summonCountB; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -309,7 +309,7 @@ class boss_arlokk : public CreatureScript uint64 _triggersSideBGUID[5]; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetZulGurubAI<boss_arlokkAI>(creature); } @@ -344,7 +344,7 @@ class npc_zulian_prowler : public CreatureScript { npc_zulian_prowlerAI(Creature* creature) : ScriptedAI(creature), _instance(creature->GetInstanceScript()) { } - void Reset() + void Reset() OVERRIDE { if (me->GetPositionY() < -1625.0f) _sideData = 1; @@ -360,20 +360,20 @@ class npc_zulian_prowler : public CreatureScript _events.ScheduleEvent(EVENT_ATTACK, 6000); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { me->GetMotionMaster()->Clear(false); me->RemoveAura(SPELL_SNEAK_RANK_1_1); me->RemoveAura(SPELL_SNEAK_RANK_1_2); } - void SpellHit(Unit* caster, SpellInfo const* spell) + void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_MARK_OF_ARLOKK_TRIGGER) // Should only hit if line of sight me->Attack(caster, true); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (_instance) { @@ -386,7 +386,7 @@ class npc_zulian_prowler : public CreatureScript me->DespawnOrUnsummon(4000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (UpdateVictim()) { @@ -416,7 +416,7 @@ class npc_zulian_prowler : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetZulGurubAI<npc_zulian_prowlerAI>(creature); } @@ -435,7 +435,7 @@ class go_gong_of_bethekk : public GameObjectScript { public: go_gong_of_bethekk() : GameObjectScript("go_gong_of_bethekk") {} - bool OnGossipHello(Player* /*player*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE { if (go->GetInstanceScript()) { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp index fe9c0be49aa..a6ed3b72146 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp @@ -49,17 +49,17 @@ class boss_gahzranka : public CreatureScript // gahzranka { boss_gahzrankaAI(Creature* creature) : BossAI(creature, DATA_GAHZRANKA) {} - void Reset() + void Reset() OVERRIDE { _Reset(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_FROSTBREATH, 8000); @@ -67,7 +67,7 @@ class boss_gahzranka : public CreatureScript // gahzranka events.ScheduleEvent(EVENT_SLAM, 17000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -102,7 +102,7 @@ class boss_gahzranka : public CreatureScript // gahzranka } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_gahzrankaAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp index 5fc1f10ef00..3c472b1e6d5 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp @@ -47,24 +47,24 @@ class boss_grilek : public CreatureScript // grilek { boss_grilekAI(Creature* creature) : BossAI(creature, DATA_EDGE_OF_MADNESS) {} - void Reset() + void Reset() OVERRIDE { _Reset(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_AVATAR, urand(15000, 25000)); events.ScheduleEvent(EVENT_GROUND_TREMOR, urand(15000, 25000)); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -103,7 +103,7 @@ class boss_grilek : public CreatureScript // grilek } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_grilekAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp index 18b1bc21ea3..7603e14ea2a 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp @@ -72,17 +72,17 @@ class boss_hakkar : public CreatureScript { boss_hakkarAI(Creature* creature) : BossAI(creature, DATA_HAKKAR) {} - void Reset() + void Reset() OVERRIDE { _Reset(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_BLOOD_SIPHON, 90000); @@ -103,7 +103,7 @@ class boss_hakkar : public CreatureScript Talk(SAY_AGGRO); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -167,7 +167,7 @@ class boss_hakkar : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_hakkarAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp index e92d3266c45..27159a700cb 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp @@ -48,17 +48,17 @@ class boss_hazzarah : public CreatureScript { boss_hazzarahAI(Creature* creature) : BossAI(creature, DATA_EDGE_OF_MADNESS) {} - void Reset() + void Reset() OVERRIDE { _Reset(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_MANABURN, urand(4000, 10000)); @@ -66,7 +66,7 @@ class boss_hazzarah : public CreatureScript events.ScheduleEvent(EVENT_ILLUSIONS, urand(10000, 18000)); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -111,7 +111,7 @@ class boss_hazzarah : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_hazzarahAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp index 2fb4e9eb4b3..2a04a03938d 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp @@ -68,7 +68,7 @@ class boss_jeklik : public CreatureScript //jeklik bool PhaseTwo; - void Reset() + void Reset() OVERRIDE { _Reset(); Charge_Timer = 20000; @@ -84,20 +84,20 @@ class boss_jeklik : public CreatureScript //jeklik PhaseTwo = false; } - 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); DoCast(me, SPELL_BAT_FORM); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -211,7 +211,7 @@ class boss_jeklik : public CreatureScript //jeklik } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_jeklikAI(creature); } @@ -239,7 +239,7 @@ class npc_batrider : public CreatureScript uint32 Bomb_Timer; uint32 Check_Timer; - void Reset() + void Reset() OVERRIDE { Bomb_Timer = 2000; Check_Timer = 1000; @@ -247,9 +247,9 @@ class npc_batrider : public CreatureScript me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -284,7 +284,7 @@ class npc_batrider : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_batriderAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp index 9f22bfdcbd8..0bbfefc69fb 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp @@ -65,17 +65,17 @@ class boss_jindo : public CreatureScript { boss_jindoAI(Creature* creature) : BossAI(creature, DATA_JINDO) {} - void Reset() + void Reset() OVERRIDE { _Reset(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_BRAINWASHTOTEM, 20000); @@ -86,7 +86,7 @@ class boss_jindo : public CreatureScript Talk(SAY_AGGRO); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -176,7 +176,7 @@ class boss_jindo : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_jindoAI(creature); } @@ -203,16 +203,16 @@ class npc_healing_ward : public CreatureScript InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { Heal_Timer = 2000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Heal_Timer if (Heal_Timer <= diff) @@ -230,7 +230,7 @@ class npc_healing_ward : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_healing_wardAI(creature); } @@ -252,15 +252,15 @@ class npc_shade_of_jindo : public CreatureScript uint32 ShadowShock_Timer; - void Reset() + void Reset() OVERRIDE { ShadowShock_Timer = 1000; DoCast(me, SPELL_INVISIBLE, true); } - void EnterCombat(Unit* /*who*/){} + void EnterCombat(Unit* /*who*/)OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //ShadowShock_Timer @@ -274,7 +274,7 @@ class npc_shade_of_jindo : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_shade_of_jindoAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index bb27c6f7630..506fbe79508 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -112,7 +112,7 @@ class boss_mandokir : public CreatureScript { boss_mandokirAI(Creature* creature) : BossAI(creature, DATA_MANDOKIR) { } - void Reset() + void Reset() OVERRIDE { if (me->GetPositionZ() > 140.0f) { @@ -128,7 +128,7 @@ class boss_mandokir : public CreatureScript me->Mount(MODEL_OHGAN_MOUNT); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { // Do not want to unsummon Ohgan for (int i = 0; i < CHAINED_SPIRT_COUNT; ++i) @@ -138,7 +138,7 @@ class boss_mandokir : public CreatureScript instance->SaveToDB(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_OVERPOWER, urand(7000, 9000)); @@ -161,7 +161,7 @@ class boss_mandokir : public CreatureScript DoZoneInCombat(); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -177,7 +177,7 @@ class boss_mandokir : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type == WAYPOINT_MOTION_TYPE) { @@ -191,7 +191,7 @@ class boss_mandokir : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { events.Update(diff); @@ -278,7 +278,7 @@ class boss_mandokir : public CreatureScript uint64 chainedSpirtGUIDs[CHAINED_SPIRT_COUNT]; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetZulGurubAI<boss_mandokirAI>(creature); } @@ -299,19 +299,19 @@ class npc_ohgan : public CreatureScript { npc_ohganAI(Creature* creature) : ScriptedAI(creature), instance(creature->GetInstanceScript()) { } - void Reset() + void Reset() OVERRIDE { SunderArmor_Timer = 5000; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { instance->SetBossState(DATA_OHGAN, DONE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { // Return since we have no target if (!UpdateVictim()) @@ -331,7 +331,7 @@ class npc_ohgan : public CreatureScript InstanceScript* instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetZulGurubAI<npc_ohganAI>(creature); } @@ -351,20 +351,20 @@ class npc_vilebranch_speaker : public CreatureScript { npc_vilebranch_speakerAI(Creature* creature) : ScriptedAI(creature), instance(creature->GetInstanceScript()) { } - void Reset() + void Reset() OVERRIDE { demoralizing_Shout_Timer = urand (2000, 4000); cleave_Timer = urand (5000, 8000); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { instance->SetBossState(DATA_MANDOKIR, SPECIAL); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { // Return since we have no target if (!UpdateVictim()) @@ -391,7 +391,7 @@ class npc_vilebranch_speaker : public CreatureScript InstanceScript* instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_vilebranch_speakerAI(creature); } @@ -414,13 +414,13 @@ class spell_threatening_gaze : public SpellScriptLoader caster->CastSpell(target, SPELL_WATCH_CHARGE); } - void Register() + void Register() OVERRIDE { OnEffectRemove += AuraEffectRemoveFn(spell_threatening_gaze_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_threatening_gaze_AuraScript(); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp index 3fd46bd644e..c372cb0324d 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp @@ -77,25 +77,25 @@ class boss_marli : public CreatureScript { boss_marliAI(Creature* creature) : BossAI(creature, DATA_MARLI) {} - void Reset() + void Reset() OVERRIDE { _Reset(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_SPAWN_START_SPIDERS, 1000, 0, PHASE_ONE); Talk(SAY_AGGRO); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -210,7 +210,7 @@ class boss_marli : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_marliAI(creature); } @@ -227,16 +227,16 @@ class npc_spawn_of_marli : public CreatureScript uint32 LevelUp_Timer; - void Reset() + void Reset() OVERRIDE { LevelUp_Timer = 3000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -253,7 +253,7 @@ class npc_spawn_of_marli : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_spawn_of_marliAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp index 8b526c7ad82..4d9d446d823 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp @@ -55,7 +55,7 @@ class boss_renataki : public CreatureScript bool Invisible; bool Ambushed; - void Reset() + void Reset() OVERRIDE { _Reset(); Invisible_Timer = urand(8000, 18000); @@ -68,17 +68,17 @@ class boss_renataki : public CreatureScript Ambushed = false; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -158,7 +158,7 @@ class boss_renataki : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_renatakiAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp index 60d553d4a8e..6a945c545a0 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp @@ -87,20 +87,20 @@ class boss_thekal : public CreatureScript bool Enraged; bool WasDead; - void Reset() + void Reset() OVERRIDE { _Reset(); Enraged = false; WasDead = false; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_MORTALCLEAVE, 4000, 0, PHASE_ONE); // Phase 1 @@ -110,13 +110,13 @@ class boss_thekal : public CreatureScript Talk(SAY_AGGRO); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { if (instance) instance->SetBossState(DATA_THEKAL, NOT_STARTED); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -249,7 +249,7 @@ class boss_thekal : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_thekalAI(creature); } @@ -277,7 +277,7 @@ class npc_zealot_lorkhan : public CreatureScript InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { Shield_Timer = 1000; BloodLust_Timer = 16000; @@ -294,11 +294,11 @@ class npc_zealot_lorkhan : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -404,7 +404,7 @@ class npc_zealot_lorkhan : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_zealot_lorkhanAI(creature); } @@ -438,7 +438,7 @@ class npc_zealot_zath : public CreatureScript InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { SweepingStrikes_Timer = 13000; SinisterStrike_Timer = 8000; @@ -456,11 +456,11 @@ class npc_zealot_zath : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -557,7 +557,7 @@ class npc_zealot_zath : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_zealot_zathAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp index 955781e3097..f57503fcac0 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp @@ -91,7 +91,7 @@ class boss_venoxis : public CreatureScript { boss_venoxisAI(Creature* creature) : BossAI(creature, DATA_VENOXIS) {} - void Reset() + void Reset() OVERRIDE { _Reset(); // remove all spells and auras from previous attempts @@ -104,14 +104,14 @@ class boss_venoxis : public CreatureScript events.SetPhase(PHASE_ONE); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_VENOXIS_DEATH); me->RemoveAllAuras(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); me->SetReactState(REACT_AGGRESSIVE); @@ -130,7 +130,7 @@ class boss_venoxis : public CreatureScript DoZoneInCombat(); } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE { // check if venoxis is ready to transform if (!_transformed && !HealthAbovePct(50)) @@ -147,7 +147,7 @@ class boss_venoxis : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -262,7 +262,7 @@ class boss_venoxis : public CreatureScript bool _frenzied; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_venoxisAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp index 6fb1c682a38..0e492f57588 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp @@ -47,24 +47,24 @@ class boss_wushoolay : public CreatureScript { boss_wushoolayAI(Creature* creature) : BossAI(creature, DATA_EDGE_OF_MADNESS) {} - void Reset() + void Reset() OVERRIDE { _Reset(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_LIGHTNINGCLOUD, urand(5000, 10000)); events.ScheduleEvent(EVENT_LIGHTNINGWAVE, urand(8000, 16000)); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -95,7 +95,7 @@ class boss_wushoolay : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_wushoolayAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp index 01c5ef998f5..27e1150818e 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp @@ -100,7 +100,7 @@ class instance_zulgurub : public InstanceMapScript } } - uint64 GetData64(uint32 uiData) const + uint64 GetData64(uint32 uiData) const OVERRIDE { switch (uiData) { @@ -185,7 +185,7 @@ class instance_zulgurub : public InstanceMapScript uint64 _goGongOfBethekkGUID; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_zulgurub_InstanceMapScript(map); } diff --git a/src/server/scripts/EasternKingdoms/boss_kruul.cpp b/src/server/scripts/EasternKingdoms/boss_kruul.cpp index 80237b5013c..c1e240a0a90 100644 --- a/src/server/scripts/EasternKingdoms/boss_kruul.cpp +++ b/src/server/scripts/EasternKingdoms/boss_kruul.cpp @@ -42,7 +42,7 @@ class boss_kruul : public CreatureScript public: boss_kruul() : CreatureScript("boss_kruul") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_kruulAI (creature); } @@ -59,7 +59,7 @@ public: uint32 Rage_Timer; uint32 Hound_Timer; - void Reset() + void Reset() OVERRIDE { ShadowVolley_Timer = 10000; Cleave_Timer = 14000; @@ -70,11 +70,11 @@ public: Hound_Timer = 8000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { // When a player, pet or totem gets killed, Lord Kazzak casts this spell to instantly regenerate 70, 000 health. DoCast(me, SPELL_CAPTURESOUL); @@ -86,7 +86,7 @@ public: Hound->AI()->AttackStart(victim); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp index 3db48f747c7..55d3cc927a5 100644 --- a/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp @@ -70,7 +70,7 @@ class npc_professor_phizzlethorpe : public CreatureScript { npc_professor_phizzlethorpeAI(Creature* creature) : npc_escortAI(creature) {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -109,28 +109,28 @@ class npc_professor_phizzlethorpe : public CreatureScript } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { npc_escortAI::UpdateAI(diff); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_professor_phizzlethorpeAI(creature); } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_SUNKEN_TREASURE) { diff --git a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp index 9151c1c3a24..b102873e940 100644 --- a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp @@ -50,7 +50,7 @@ class npc_deathly_usher : public CreatureScript public: npc_deathly_usher() : CreatureScript("npc_deathly_usher") { } - 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) @@ -62,7 +62,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(3628) == QUEST_STATUS_INCOMPLETE && player->HasItemCount(10757)) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_USHER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); diff --git a/src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp b/src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp index 174fbb3f75a..49a7addaa28 100644 --- a/src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp +++ b/src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp @@ -54,7 +54,7 @@ class npc_ragged_john : public CreatureScript public: npc_ragged_john() : CreatureScript("npc_ragged_john") { } - 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) @@ -111,7 +111,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -123,7 +123,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ragged_johnAI (creature); } @@ -132,9 +132,10 @@ public: { npc_ragged_johnAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() {} + void Reset() OVERRIDE {} + + void MoveInLineOfSight(Unit* who) OVERRIDE - void MoveInLineOfSight(Unit* who) { if (who->HasAura(16468)) { @@ -149,7 +150,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} }; }; diff --git a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp index 97b3ea89cbb..ad027726654 100644 --- a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp +++ b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp @@ -44,7 +44,7 @@ class at_twilight_grove : public AreaTriggerScript public: at_twilight_grove() : AreaTriggerScript("at_twilight_grove") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) OVERRIDE { if (player->HasQuestForItem(21149)) { @@ -80,7 +80,7 @@ class boss_twilight_corrupter : public CreatureScript public: boss_twilight_corrupter() : CreatureScript("boss_twilight_corrupter") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_twilight_corrupterAI (creature); } @@ -93,18 +93,18 @@ public: uint32 CreatureOfNightmare_Timer; uint8 KillCount; - void Reset() + void Reset() OVERRIDE { SoulCorruption_Timer = 15000; CreatureOfNightmare_Timer = 30000; KillCount = 0; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(YELL_TWILIGHTCORRUPTOR_AGGRO); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) { @@ -119,7 +119,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp index ce89b91ed5f..d9da216d74d 100644 --- a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp @@ -45,18 +45,18 @@ public: { npc_ghoul_flayerAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() {} + void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (killer->GetTypeId() == TYPEID_PLAYER) me->SummonCreature(11064, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 60000); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ghoul_flayerAI (creature); } @@ -71,7 +71,7 @@ class npc_augustus_the_touched : public CreatureScript public: npc_augustus_the_touched() : CreatureScript("npc_augustus_the_touched") { } - 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_TRADE) @@ -79,7 +79,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -106,7 +106,7 @@ class npc_darrowshire_spirit : public CreatureScript public: npc_darrowshire_spirit() : CreatureScript("npc_darrowshire_spirit") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { player->SEND_GOSSIP_MENU(3873, creature->GetGUID()); player->TalkedToCreature(creature->GetEntry(), creature->GetGUID()); @@ -114,7 +114,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_darrowshire_spiritAI (creature); } @@ -123,13 +123,13 @@ public: { npc_darrowshire_spiritAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { DoCast(me, SPELL_SPIRIT_SPAWNIN); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} }; }; @@ -147,7 +147,7 @@ class npc_tirion_fordring : public CreatureScript public: npc_tirion_fordring() : CreatureScript("npc_tirion_fordring") { } - 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) @@ -172,7 +172,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); diff --git a/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp index 98b8932e1d5..7975272e4e8 100644 --- a/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp +++ b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp @@ -49,7 +49,7 @@ class npc_apprentice_mirveda : public CreatureScript public: npc_apprentice_mirveda() : CreatureScript("npc_apprentice_mirveda") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_UNEXPECTED_RESULT) { @@ -59,7 +59,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_apprentice_mirvedaAI (creature); } @@ -73,7 +73,7 @@ public: bool Summon; SummonList Summons; - void Reset() + void Reset() OVERRIDE { KillCount = 0; PlayerGUID = 0; @@ -81,28 +81,28 @@ public: Summon = false; } - void EnterCombat(Unit* /*who*/){} + void EnterCombat(Unit* /*who*/)OVERRIDE {} - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); Summons.Summon(summoned); } - void SummonedCreatureDespawn(Creature* summoned) + void SummonedCreatureDespawn(Creature* summoned) OVERRIDE { Summons.Despawn(summoned); ++KillCount; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (PlayerGUID) if (Player* player = Unit::GetPlayer(*me, PlayerGUID)) player->FailQuest(QUEST_UNEXPECTED_RESULT); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (KillCount >= 3 && PlayerGUID) if (Player* player = Unit::GetPlayer(*me, PlayerGUID)) @@ -157,7 +157,7 @@ class npc_infused_crystal : public CreatureScript public: npc_infused_crystal() : CreatureScript("npc_infused_crystal") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_infused_crystalAI (creature); } @@ -175,7 +175,7 @@ public: bool Progress; uint64 PlayerGUID; - void Reset() + void Reset() OVERRIDE { EndTimer = 0; Completed = false; @@ -184,7 +184,8 @@ public: WaveTimer = 0; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!Progress && who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 10.0f)) { @@ -198,19 +199,19 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (PlayerGUID && !Completed) if (Player* player = Unit::GetPlayer(*me, PlayerGUID)) player->FailQuest(QUEST_POWERING_OUR_DEFENSES); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (EndTimer < diff && Progress) { diff --git a/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp b/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp index d9496d53756..ebbf8ef9f5b 100644 --- a/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp @@ -48,7 +48,7 @@ class npc_budd_nedreck : public CreatureScript public: npc_budd_nedreck() : CreatureScript("npc_budd_nedreck") { } - 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) @@ -59,7 +59,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -81,7 +81,7 @@ class npc_rathis_tomber : public CreatureScript public: npc_rathis_tomber() : CreatureScript("npc_rathis_tomber") { } - 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_TRADE) @@ -89,7 +89,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -142,7 +142,7 @@ public: { npc_ranger_lilathaAI(Creature* creature) : npc_escortAI(creature) {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -199,14 +199,14 @@ public: } } - void Reset() + void Reset() OVERRIDE { if (GameObject* Cage = me->FindNearestGameObject(GO_CAGE, 20)) Cage->SetGoState(GO_STATE_READY); } }; - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_ESCAPE_FROM_THE_CATACOMBS) { @@ -218,7 +218,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ranger_lilathaAI(creature); } diff --git a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp index 653c9daec32..f68ffb66f30 100644 --- a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp @@ -59,7 +59,7 @@ class npc_00x09hl : public CreatureScript public: npc_00x09hl() : CreatureScript("npc_00x09hl") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_RESQUE_OOX_09) { @@ -78,7 +78,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_00x09hlAI(creature); } @@ -87,9 +87,9 @@ public: { npc_00x09hlAI(Creature* creature) : npc_escortAI(creature) { } - void Reset() { } + void Reset() OVERRIDE {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -107,7 +107,7 @@ public: } } - void WaypointStart(uint32 uiPointId) + void WaypointStart(uint32 uiPointId) OVERRIDE { switch (uiPointId) { @@ -132,7 +132,7 @@ public: } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (who->GetEntry() == NPC_MARAUDING_OWL || who->GetEntry() == NPC_VILE_AMBUSHER) return; @@ -140,7 +140,7 @@ public: Talk(SAY_OOX_AGGRO); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); } @@ -189,7 +189,7 @@ class npc_rinji : public CreatureScript public: npc_rinji() : CreatureScript("npc_rinji") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_RINJI_TRAPPED) { @@ -202,7 +202,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_rinjiAI(creature); } @@ -220,13 +220,13 @@ public: uint32 m_uiPostEventTimer; int m_iSpawnId; - void Reset() + void Reset() OVERRIDE { m_uiPostEventCount = 0; m_uiPostEventTimer = 3000; } - void JustRespawned() + void JustRespawned() OVERRIDE { m_bIsByOutrunner = false; m_iSpawnId = 0; @@ -234,7 +234,7 @@ public: npc_escortAI::JustRespawned(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -270,13 +270,13 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->SetWalk(false); summoned->GetMotionMaster()->MovePoint(0, m_afAmbushMoveTo[m_iSpawnId].m_fX, m_afAmbushMoveTo[m_iSpawnId].m_fY, m_afAmbushMoveTo[m_iSpawnId].m_fZ); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -302,7 +302,7 @@ public: } } - void UpdateEscortAI(const uint32 uiDiff) + void UpdateEscortAI(const uint32 uiDiff) OVERRIDE { //Check if we have a current target if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/zone_ironforge.cpp b/src/server/scripts/EasternKingdoms/zone_ironforge.cpp index 9a6cbb74ee5..6fefe0de2e9 100644 --- a/src/server/scripts/EasternKingdoms/zone_ironforge.cpp +++ b/src/server/scripts/EasternKingdoms/zone_ironforge.cpp @@ -47,7 +47,7 @@ class npc_royal_historian_archesonus : public CreatureScript public: npc_royal_historian_archesonus() : CreatureScript("npc_royal_historian_archesonus") { } - 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) @@ -76,7 +76,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); diff --git a/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp index 8f7a6b68932..519e06eee4a 100644 --- a/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp +++ b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp @@ -50,7 +50,7 @@ class npc_converted_sentry : public CreatureScript public: npc_converted_sentry() : CreatureScript("npc_converted_sentry") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_converted_sentryAI (creature); } @@ -62,16 +62,17 @@ public: bool Credit; uint32 Timer; - void Reset() + void Reset() OVERRIDE { Credit = false; Timer = 2500; } - void MoveInLineOfSight(Unit* /*who*/) {} - void EnterCombat(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void UpdateAI(uint32 diff) OVERRIDE { if (!Credit) { @@ -103,7 +104,7 @@ class npc_greengill_slave : public CreatureScript public: npc_greengill_slave() : CreatureScript("npc_greengill_slave") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_greengill_slaveAI(creature); } @@ -114,14 +115,14 @@ public: uint64 PlayerGUID; - void EnterCombat(Unit* /*who*/){} + void EnterCombat(Unit* /*who*/)OVERRIDE {} - void Reset() + void Reset() OVERRIDE { PlayerGUID = 0; } - void SpellHit(Unit* caster, const SpellInfo* spell) + void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE { if (!caster) return; @@ -145,7 +146,7 @@ public: } } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { DoMeleeAttackIfReady(); } diff --git a/src/server/scripts/EasternKingdoms/zone_loch_modan.cpp b/src/server/scripts/EasternKingdoms/zone_loch_modan.cpp index 5fb970fb98d..afdfa496f7c 100644 --- a/src/server/scripts/EasternKingdoms/zone_loch_modan.cpp +++ b/src/server/scripts/EasternKingdoms/zone_loch_modan.cpp @@ -50,7 +50,7 @@ class npc_mountaineer_pebblebitty : public CreatureScript public: npc_mountaineer_pebblebitty() : CreatureScript("npc_mountaineer_pebblebitty") { } - 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) @@ -86,7 +86,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); diff --git a/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp b/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp index 3cf25d90077..20a47325a9c 100644 --- a/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp +++ b/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp @@ -45,7 +45,7 @@ class npc_corporal_keeshan : public CreatureScript public: npc_corporal_keeshan() : CreatureScript("npc_corporal_keeshan") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_MISSING_IN_ACTION) { @@ -56,7 +56,7 @@ public: return false; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_corporal_keeshanAI(creature); } @@ -70,7 +70,7 @@ public: uint32 uiMockingBlowTimer; uint32 uiShieldBashTimer; - void Reset() + void Reset() OVERRIDE { uiTimer = 0; uiPhase = 0; @@ -78,7 +78,7 @@ public: uiShieldBashTimer = 8000; } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -105,7 +105,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (HasEscortState(STATE_ESCORT_NONE)) return; diff --git a/src/server/scripts/EasternKingdoms/zone_silvermoon_city.cpp b/src/server/scripts/EasternKingdoms/zone_silvermoon_city.cpp index edb147d7a7e..b2a7d34cd25 100644 --- a/src/server/scripts/EasternKingdoms/zone_silvermoon_city.cpp +++ b/src/server/scripts/EasternKingdoms/zone_silvermoon_city.cpp @@ -49,7 +49,7 @@ class npc_blood_knight_stillblade : public CreatureScript public: npc_blood_knight_stillblade() : CreatureScript("npc_blood_knight_stillblade") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_blood_knight_stillbladeAI (creature); } @@ -61,7 +61,7 @@ public: uint32 lifeTimer; bool spellHit; - void Reset() + void Reset() OVERRIDE { lifeTimer = 120000; me->SetStandState(UNIT_STAND_STATE_DEAD); @@ -69,15 +69,16 @@ public: spellHit = 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 (me->IsStandState()) { @@ -88,7 +89,7 @@ public: } } - void SpellHit(Unit* caster, const SpellInfo* Spellkind) + void SpellHit(Unit* caster, const SpellInfo* Spellkind) OVERRIDE { if (Spellkind->Id != SPELL_SHIMMERING_VESSEL || spellHit) return; diff --git a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp index d9f773b83a7..acabe63fd1b 100644 --- a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp @@ -67,7 +67,7 @@ public: { npc_deathstalker_erlandAI(Creature* creature) : npc_escortAI(creature) {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -108,15 +108,15 @@ public: } } - void Reset() {} + void Reset() OVERRIDE {} - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { Talk(SAY_AGGRO, who->GetGUID()); } }; - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_ESCORTING) { @@ -129,7 +129,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_deathstalker_erlandAI(creature); } @@ -166,7 +166,7 @@ class pyrewood_ambush : public CreatureScript public: pyrewood_ambush() : CreatureScript("pyrewood_ambush") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest *quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest *quest) OVERRIDE { if (quest->GetQuestId() == QUEST_PYREWOOD_AMBUSH && !CAST_AI(pyrewood_ambush::pyrewood_ambushAI, creature->AI())->QuestInProgress) { @@ -179,7 +179,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new pyrewood_ambushAI (creature); } @@ -199,7 +199,7 @@ public: bool QuestInProgress; - void Reset() + void Reset() OVERRIDE { WaitTimer = WAIT_SECS; @@ -212,15 +212,15 @@ public: } } - void EnterCombat(Unit* /*who*/){} + void EnterCombat(Unit* /*who*/)OVERRIDE {} - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { Summons.Summon(summoned); ++KillCount; } - void SummonedCreatureDespawn(Creature* summoned) + void SummonedCreatureDespawn(Creature* summoned) OVERRIDE { Summons.Despawn(summoned); --KillCount; @@ -245,7 +245,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (PlayerGUID) if (Player* player = Unit::GetPlayer(*me, PlayerGUID)) @@ -253,7 +253,7 @@ public: player->FailQuest(QUEST_PYREWOOD_AMBUSH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //TC_LOG_INFO(LOG_FILTER_TSCR, "DEBUG: p(%i) k(%i) d(%u) W(%i)", Phase, KillCount, diff, WaitTimer); diff --git a/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp b/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp index e3a9465ffd3..61c8e6aa28e 100644 --- a/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp +++ b/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp @@ -50,7 +50,7 @@ class npc_archmage_malin : public CreatureScript public: npc_archmage_malin() : CreatureScript("npc_archmage_malin") { } - 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) @@ -62,7 +62,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -91,7 +91,7 @@ class npc_bartleby : public CreatureScript public: npc_bartleby() : CreatureScript("npc_bartleby") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_BEAT) { @@ -101,7 +101,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_bartlebyAI(creature); } @@ -115,13 +115,13 @@ public: uint32 m_uiNormalFaction; - void Reset() + void Reset() OVERRIDE { if (me->getFaction() != m_uiNormalFaction) me->setFaction(m_uiNormalFaction); } - void AttackedBy(Unit* pAttacker) + void AttackedBy(Unit* pAttacker) OVERRIDE { if (me->GetVictim()) return; @@ -132,7 +132,7 @@ public: AttackStart(pAttacker); } - void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) + void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) OVERRIDE { if (uiDamage > me->GetHealth() || me->HealthBelowPctDamaged(15, uiDamage)) { @@ -161,7 +161,7 @@ class npc_lady_katrana_prestor : public CreatureScript public: npc_lady_katrana_prestor() : CreatureScript("npc_lady_katrana_prestor") { } - 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) @@ -186,7 +186,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -226,7 +226,7 @@ class npc_lord_gregor_lescovar : public CreatureScript public: npc_lord_gregor_lescovar() : CreatureScript("npc_lord_gregor_lescovar") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_lord_gregor_lescovarAI(creature); } @@ -243,7 +243,7 @@ public: uint64 MarzonGUID; - void Reset() + void Reset() OVERRIDE { uiTimer = 0; uiPhase = 0; @@ -251,7 +251,7 @@ public: MarzonGUID = 0; } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { me->DisappearAndDie(); @@ -262,7 +262,7 @@ public: } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (Creature* pMarzon = Unit::GetCreature(*me, MarzonGUID)) { @@ -271,7 +271,7 @@ public: } } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -308,7 +308,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (uiPhase) { @@ -381,7 +381,7 @@ class npc_marzon_silent_blade : public CreatureScript public: npc_marzon_silent_blade() : CreatureScript("npc_marzon_silent_blade") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_marzon_silent_bladeAI(creature); } @@ -393,12 +393,12 @@ public: me->SetWalk(true); } - void Reset() + void Reset() OVERRIDE { me->RestoreFaction(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { Talk(SAY_MARZON_2); @@ -412,7 +412,7 @@ public: } } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { me->DisappearAndDie(); @@ -426,7 +426,7 @@ public: } } - void MovementInform(uint32 uiType, uint32 /*uiId*/) + void MovementInform(uint32 uiType, uint32 /*uiId*/) OVERRIDE { if (uiType != POINT_MOTION_TYPE) return; @@ -448,7 +448,7 @@ public: } } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!UpdateVictim()) return; @@ -482,7 +482,7 @@ class npc_tyrion_spybot : public CreatureScript public: npc_tyrion_spybot() : CreatureScript("npc_tyrion_spybot") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_tyrion_spybotAI(creature); } @@ -494,13 +494,13 @@ public: uint32 uiTimer; uint32 uiPhase; - void Reset() + void Reset() OVERRIDE { uiTimer = 0; uiPhase = 0; } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -524,7 +524,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (uiPhase) { @@ -620,7 +620,7 @@ class npc_tyrion : public CreatureScript public: npc_tyrion() : CreatureScript("npc_tyrion") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_THE_ATTACK) { diff --git a/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp b/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp index 45b651872ac..d40a986db47 100644 --- a/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp +++ b/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp @@ -41,7 +41,7 @@ class npc_yenniku : public CreatureScript public: npc_yenniku() : CreatureScript("npc_yenniku") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_yennikuAI (creature); } @@ -56,13 +56,13 @@ public: uint32 Reset_Timer; bool bReset; - void Reset() + void Reset() OVERRIDE { Reset_Timer = 0; me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_NONE); } - void SpellHit(Unit* caster, const SpellInfo* spell) + void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE { if (bReset || spell->Id != 3607) return; @@ -82,9 +82,9 @@ public: } } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (bReset) { diff --git a/src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp b/src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp index c7780bb0065..bec49e0f15c 100644 --- a/src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp +++ b/src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp @@ -45,7 +45,7 @@ public: npc_galen_goodward() : CreatureScript("npc_galen_goodward") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_GALENS_ESCAPE) { @@ -56,7 +56,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_galen_goodwardAI(creature); } @@ -72,18 +72,18 @@ public: uint64 m_uiGalensCageGUID; uint32 m_uiPeriodicSay; - void Reset() + void Reset() OVERRIDE { m_uiPeriodicSay = 6000; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (HasEscortState(STATE_ESCORT_ESCORTING)) Talk(SAY_ATTACKED, who->GetGUID()); } - void WaypointStart(uint32 uiPointId) + void WaypointStart(uint32 uiPointId) OVERRIDE { switch (uiPointId) { @@ -107,7 +107,7 @@ public: } } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -128,7 +128,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { npc_escortAI::UpdateAI(uiDiff); diff --git a/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp index 86507624a38..000fe181793 100644 --- a/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp +++ b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp @@ -50,7 +50,7 @@ class npc_calvin_montague : public CreatureScript public: npc_calvin_montague() : CreatureScript("npc_calvin_montague") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_590) { @@ -61,7 +61,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_calvin_montagueAI (creature); } @@ -74,7 +74,7 @@ public: uint32 m_uiPhaseTimer; uint64 m_uiPlayerGUID; - void Reset() + void Reset() OVERRIDE { m_uiPhase = 0; m_uiPhaseTimer = 5000; @@ -86,9 +86,9 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void AttackedBy(Unit* pAttacker) + void AttackedBy(Unit* pAttacker) OVERRIDE { if (me->GetVictim() || me->IsFriendlyTo(pAttacker)) return; @@ -96,7 +96,7 @@ public: AttackStart(pAttacker); } - void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) + void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) OVERRIDE { if (uiDamage > me->GetHealth() || me->HealthBelowPctDamaged(15, uiDamage)) { @@ -113,7 +113,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (m_uiPhase) { @@ -172,7 +172,7 @@ class go_mausoleum_door : public GameObjectScript public: go_mausoleum_door() : GameObjectScript("go_mausoleum_door") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) + bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE { if (player->GetQuestStatus(QUEST_ULAG) != QUEST_STATUS_INCOMPLETE) return false; @@ -193,7 +193,7 @@ class go_mausoleum_trigger : public GameObjectScript public: go_mausoleum_trigger() : GameObjectScript("go_mausoleum_trigger") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (player->GetQuestStatus(QUEST_ULAG) != QUEST_STATUS_INCOMPLETE) return false; diff --git a/src/server/scripts/EasternKingdoms/zone_undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp index a1dc0cb653f..75b6265b6d0 100644 --- a/src/server/scripts/EasternKingdoms/zone_undercity.cpp +++ b/src/server/scripts/EasternKingdoms/zone_undercity.cpp @@ -77,7 +77,7 @@ class npc_lady_sylvanas_windrunner : public CreatureScript public: npc_lady_sylvanas_windrunner() : CreatureScript("npc_lady_sylvanas_windrunner") { } - bool OnQuestReward(Player* /*player*/, Creature* creature, const Quest *_Quest, uint32 /*slot*/) + bool OnQuestReward(Player* /*player*/, Creature* creature, const Quest *_Quest, uint32 /*slot*/) OVERRIDE { if (_Quest->GetQuestId() == QUEST_JOURNEY_TO_UNDERCITY) { @@ -92,7 +92,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_lady_sylvanas_windrunnerAI (creature); } @@ -111,7 +111,7 @@ public: uint32 ShotTimer; uint32 MultiShotTimer; - void Reset() + void Reset() OVERRIDE { LamentEventTimer = 5000; LamentEvent = false; @@ -124,9 +124,9 @@ public: MultiShotTimer = 10000; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned->GetEntry() == ENTRY_HIGHBORNE_BUNNY) { @@ -142,7 +142,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (LamentEvent) { @@ -224,7 +224,7 @@ class npc_highborne_lamenter : public CreatureScript public: npc_highborne_lamenter() : CreatureScript("npc_highborne_lamenter") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_highborne_lamenterAI (creature); } @@ -238,7 +238,7 @@ public: bool EventMove; bool EventCast; - void Reset() + void Reset() OVERRIDE { EventMoveTimer = 10000; EventCastTimer = 17500; @@ -246,9 +246,9 @@ public: EventCast = true; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (EventMove) { @@ -290,7 +290,7 @@ class npc_parqual_fintallas : public CreatureScript public: npc_parqual_fintallas() : CreatureScript("npc_parqual_fintallas") { } - 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) @@ -306,7 +306,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); diff --git a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp index f37a54cdbeb..fd8fab62821 100644 --- a/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp @@ -53,7 +53,7 @@ class npcs_dithers_and_arbington : public CreatureScript public: npcs_dithers_and_arbington() : CreatureScript("npcs_dithers_and_arbington") { } - 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) @@ -85,7 +85,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -126,7 +126,7 @@ class npc_myranda_the_hag : public CreatureScript public: npc_myranda_the_hag() : CreatureScript("npc_myranda_the_hag") { } - 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) @@ -137,7 +137,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -165,7 +165,7 @@ class npc_the_scourge_cauldron : public CreatureScript public: npc_the_scourge_cauldron() : CreatureScript("npc_the_scourge_cauldron") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_the_scourge_cauldronAI (creature); } @@ -174,9 +174,9 @@ public: { npc_the_scourge_cauldronAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() {} + void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} void DoDie() { @@ -188,7 +188,8 @@ public: me->SetRespawnDelay(600); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!who) return; @@ -250,7 +251,7 @@ class npc_andorhal_tower : public CreatureScript public: npc_andorhal_tower() : CreatureScript("npc_andorhal_tower") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_andorhal_towerAI (creature); } @@ -262,7 +263,8 @@ public: SetCombatMovement(false); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!who || who->GetTypeId() != TYPEID_PLAYER) return; @@ -300,7 +302,7 @@ class npc_anchorite_truuen : public CreatureScript public: npc_anchorite_truuen() : CreatureScript("npc_anchorite_truuen") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { npc_escortAI* pEscortAI = CAST_AI(npc_anchorite_truuen::npc_anchorite_truuenAI, creature->AI()); @@ -309,7 +311,7 @@ public: return false; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_anchorite_truuenAI(creature); } @@ -326,18 +328,18 @@ public: Creature* Ughost; Creature* Theldanis; - void Reset() + void Reset() OVERRIDE { m_uiChatTimer = 7000; } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned->GetEntry() == NPC_GHOUL) summoned->AI()->AttackStart(me); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); @@ -392,15 +394,15 @@ public: } } - void EnterCombat(Unit* /*who*/){} + void EnterCombat(Unit* /*who*/)OVERRIDE {} - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Player* player = GetPlayerForEscort()) player->FailQuest(QUEST_TOMB_LIGHTBRINGER); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { npc_escortAI::UpdateAI(uiDiff); DoMeleeAttackIfReady(); diff --git a/src/server/scripts/EasternKingdoms/zone_westfall.cpp b/src/server/scripts/EasternKingdoms/zone_westfall.cpp index 76712d6c53e..0ded937d5a8 100644 --- a/src/server/scripts/EasternKingdoms/zone_westfall.cpp +++ b/src/server/scripts/EasternKingdoms/zone_westfall.cpp @@ -64,7 +64,7 @@ class npc_daphne_stilwell : public CreatureScript public: npc_daphne_stilwell() : CreatureScript("npc_daphne_stilwell") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_TOME_VALOR) { @@ -77,7 +77,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_daphne_stilwellAI(creature); } @@ -89,7 +89,7 @@ public: uint32 uiWPHolder; uint32 uiShootTimer; - void Reset() + void Reset() OVERRIDE { if (HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -112,7 +112,7 @@ public: uiShootTimer = 0; } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -164,7 +164,7 @@ public: } } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who) return; @@ -179,7 +179,7 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } @@ -221,7 +221,7 @@ class npc_defias_traitor : public CreatureScript public: npc_defias_traitor() : CreatureScript("npc_defias_traitor") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_DEFIAS_BROTHERHOOD) { @@ -234,7 +234,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_defias_traitorAI(creature); } @@ -243,7 +243,7 @@ public: { npc_defias_traitorAI(Creature* creature) : npc_escortAI(creature) { Reset(); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -264,12 +264,12 @@ public: } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { Talk(SAY_AGGRO, who->GetGUID()); } - void Reset() {} + void Reset() OVERRIDE {} }; }; diff --git a/src/server/scripts/EasternKingdoms/zone_wetlands.cpp b/src/server/scripts/EasternKingdoms/zone_wetlands.cpp index 86acfcd9794..dc4154c3d3e 100644 --- a/src/server/scripts/EasternKingdoms/zone_wetlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_wetlands.cpp @@ -52,7 +52,7 @@ class npc_tapoke_slim_jahn : public CreatureScript public: npc_tapoke_slim_jahn() : CreatureScript("npc_tapoke_slim_jahn") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_tapoke_slim_jahnAI(creature); } @@ -63,13 +63,13 @@ public: bool IsFriendSummoned; - void Reset() + void Reset() OVERRIDE { if (!HasEscortState(STATE_ESCORT_ESCORTING)) IsFriendSummoned = false; } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -82,7 +82,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (HasEscortState(STATE_ESCORT_ESCORTING) && !IsFriendSummoned && GetPlayerForEscort()) { @@ -93,13 +93,13 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (Player* player = GetPlayerForEscort()) summoned->AI()->AttackStart(player); } - void AttackedBy(Unit* pAttacker) + void AttackedBy(Unit* pAttacker) OVERRIDE { if (me->GetVictim()) return; @@ -110,7 +110,7 @@ public: AttackStart(pAttacker); } - void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) + void DamageTaken(Unit* /*pDoneBy*/, uint32& uiDamage) OVERRIDE { if (HealthBelowPct(20)) { @@ -141,7 +141,7 @@ class npc_mikhail : public CreatureScript public: npc_mikhail() : CreatureScript("npc_mikhail") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_MISSING_DIPLO_PT11) { diff --git a/src/server/scripts/Events/childrens_week.cpp b/src/server/scripts/Events/childrens_week.cpp index 2ef776e4e76..655fa65f2f2 100644 --- a/src/server/scripts/Events/childrens_week.cpp +++ b/src/server/scripts/Events/childrens_week.cpp @@ -160,7 +160,8 @@ class npc_winterfin_playmate : public CreatureScript orphanGUID = 0; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!phase && who && who->GetDistance2d(me) < 10.0f) if (Player* player = who->ToPlayer()) @@ -258,7 +259,8 @@ class npc_snowfall_glade_playmate : public CreatureScript orphanGUID = 0; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!phase && who && who->GetDistance2d(me) < 10.0f) if (Player* player = who->ToPlayer()) @@ -358,7 +360,8 @@ class npc_the_biggest_tree : public CreatureScript orphanGUID = 0; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!phase && who && who->GetDistance2d(me) < 10.0f) if (Player* player = who->ToPlayer()) @@ -444,7 +447,8 @@ class npc_high_oracle_soo_roo : public CreatureScript orphanGUID = 0; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!phase && who && who->GetDistance2d(me) < 10.0f) if (Player* player = who->ToPlayer()) @@ -532,7 +536,8 @@ class npc_elder_kekek : public CreatureScript orphanGUID = 0; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!phase && who && who->GetDistance2d(me) < 10.0f) if (Player* player = who->ToPlayer()) @@ -620,7 +625,8 @@ class npc_the_etymidian : public CreatureScript orphanGUID = 0; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!phase && who && who->GetDistance2d(me) < 10.0f) if (Player* player = who->ToPlayer()) @@ -732,7 +738,8 @@ class npc_alexstraza_the_lifebinder : public CreatureScript } } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!phase && who && who->GetDistance2d(me) < 10.0f) if (Player* player = who->ToPlayer()) @@ -926,7 +933,8 @@ class npc_cw_area_trigger : public CreatureScript me->SetDisplayId(DISPLAY_INVISIBLE); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (who && me->GetDistance2d(who) < 20.0f) if (Player* player = who->ToPlayer()) @@ -1022,7 +1030,8 @@ class npc_grizzlemaw_cw_trigger : public CreatureScript me->SetDisplayId(DISPLAY_INVISIBLE); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (who && who->GetDistance2d(me) < 10.0f) if (Player* player = who->ToPlayer()) diff --git a/src/server/scripts/Examples/example_commandscript.cpp b/src/server/scripts/Examples/example_commandscript.cpp index a87b8c5a555..0c10cec5155 100644 --- a/src/server/scripts/Examples/example_commandscript.cpp +++ b/src/server/scripts/Examples/example_commandscript.cpp @@ -43,7 +43,7 @@ class example_commandscript : public CommandScript return true; } - ChatCommand* GetCommands() const + ChatCommand* GetCommands() const OVERRIDE { static ChatCommand HelloWorldCommandTable[] = { diff --git a/src/server/scripts/Examples/example_creature.cpp b/src/server/scripts/Examples/example_creature.cpp index ae4980c2d75..92c248c1fc9 100644 --- a/src/server/scripts/Examples/example_creature.cpp +++ b/src/server/scripts/Examples/example_creature.cpp @@ -111,7 +111,7 @@ class example_creature : public CreatureScript // *** HANDLED FUNCTION *** //This is called after spawn and whenever the core decides we need to evade - void Reset() + void Reset() OVERRIDE { m_uiPhase = 1; // Start in phase 1 m_uiPhaseTimer = 60000; // 60 seconds @@ -125,7 +125,7 @@ class example_creature : public CreatureScript // *** HANDLED FUNCTION *** // Enter Combat called once per combat - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { //Say some stuff Talk(SAY_AGGRO, who->GetGUID()); @@ -134,21 +134,21 @@ class example_creature : public CreatureScript // *** HANDLED FUNCTION *** // Attack Start is called when victim change (including at start of combat) // By default, attack who and start movement toward the victim. - //void AttackStart(Unit* who) + //void AttackStart(Unit* who) OVERRIDE //{ // ScriptedAI::AttackStart(who); //} // *** HANDLED FUNCTION *** // Called when going out of combat. Reset is called just after. - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { Talk(SAY_EVADE); } // *** HANDLED FUNCTION *** //Our Receive emote function - void ReceiveEmote(Player* /*player*/, uint32 uiTextEmote) + void ReceiveEmote(Player* /*player*/, uint32 uiTextEmote) OVERRIDE { me->HandleEmoteCommand(uiTextEmote); @@ -165,7 +165,7 @@ class example_creature : public CreatureScript // *** HANDLED FUNCTION *** //Update AI is called Every single map update (roughly once every 50ms if a player is within the grid) - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { //Out of combat timers if (!me->GetVictim()) @@ -262,12 +262,12 @@ class example_creature : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new example_creatureAI(creature); } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->SEND_GOSSIP_MENU(907, creature->GetGUID()); @@ -275,7 +275,7 @@ class example_creature : 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) diff --git a/src/server/scripts/Examples/example_escort.cpp b/src/server/scripts/Examples/example_escort.cpp index 5d0f2321402..8cbd2fc4933 100644 --- a/src/server/scripts/Examples/example_escort.cpp +++ b/src/server/scripts/Examples/example_escort.cpp @@ -79,13 +79,13 @@ class example_escort : public CreatureScript uint32 m_uiDeathCoilTimer; uint32 m_uiChatTimer; - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } // Pure Virtual Functions (Have to be implemented) - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -108,7 +108,7 @@ class example_escort : public CreatureScript } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -119,13 +119,13 @@ class example_escort : public CreatureScript Talk(SAY_AGGRO2); } - void Reset() + void Reset() OVERRIDE { m_uiDeathCoilTimer = 4000; m_uiChatTimer = 4000; } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -142,7 +142,7 @@ class example_escort : public CreatureScript Talk(SAY_DEATH_3); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { //Must update npc_escortAI npc_escortAI::UpdateAI(uiDiff); @@ -186,12 +186,12 @@ class example_escort : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new example_escortAI(creature); } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { player->TalkedToCreature(creature->GetEntry(), creature->GetGUID()); player->PrepareGossipMenu(creature, 0); @@ -205,7 +205,7 @@ class example_escort : 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(); npc_escortAI* pEscortAI = CAST_AI(example_escort::example_escortAI, creature->AI()); diff --git a/src/server/scripts/Examples/example_gossip_codebox.cpp b/src/server/scripts/Examples/example_gossip_codebox.cpp index 432e7e74c35..90aae21f807 100644 --- a/src/server/scripts/Examples/example_gossip_codebox.cpp +++ b/src/server/scripts/Examples/example_gossip_codebox.cpp @@ -55,7 +55,7 @@ class example_gossip_codebox : public CreatureScript { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1, "", 0, true); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); @@ -65,7 +65,7 @@ class example_gossip_codebox : 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+2) @@ -78,7 +78,7 @@ class example_gossip_codebox : public CreatureScript return true; } - bool OnGossipSelectCode(Player* player, Creature* creature, uint32 sender, uint32 action, char const* code) + bool OnGossipSelectCode(Player* player, Creature* creature, uint32 sender, uint32 action, char const* code) OVERRIDE { player->PlayerTalkClass->ClearMenus(); if (sender == GOSSIP_SENDER_MAIN) diff --git a/src/server/scripts/Examples/example_misc.cpp b/src/server/scripts/Examples/example_misc.cpp index 5f329e94a31..980d52c729c 100644 --- a/src/server/scripts/Examples/example_misc.cpp +++ b/src/server/scripts/Examples/example_misc.cpp @@ -35,7 +35,7 @@ class AT_example_areatrigger : public AreaTriggerScript { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) + bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) OVERRIDE { player->Kill(player); return true; @@ -51,7 +51,7 @@ class ItemUse_example_item : public ItemScript { } - bool OnUse(Player* /*player*/, Item* /*item*/, SpellCastTargets const& /*targets*/) + bool OnUse(Player* /*player*/, Item* /*item*/, SpellCastTargets const& /*targets*/) OVERRIDE { sScriptMgr->LoadDatabase(); return true; @@ -67,7 +67,7 @@ class GOHello_example_go_teleporter : public GameObjectScript { } - bool OnGossipHello(Player* player, GameObject* /*go*/) + bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE { player->TeleportTo(0, 1807.07f, 336.105f, 70.3975f, 0.0f); return false; diff --git a/src/server/scripts/Examples/example_spell.cpp b/src/server/scripts/Examples/example_spell.cpp index c3a56e7a2cb..30206ec555c 100644 --- a/src/server/scripts/Examples/example_spell.cpp +++ b/src/server/scripts/Examples/example_spell.cpp @@ -50,7 +50,7 @@ class spell_ex_5581 : public SpellScriptLoader // function called on server startup // checks if script has data required for it to work - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { // check if spellid 70522 exists in dbc, we will trigger it later if (!sSpellMgr->GetSpellInfo(SPELL_TRIGGERED)) @@ -60,7 +60,7 @@ class spell_ex_5581 : public SpellScriptLoader // function called just after script is added to spell // we initialize local variables if needed - bool Load() + bool Load() OVERRIDE { localVariable = "we're using local variable"; localVariable2 = new char(); @@ -73,7 +73,7 @@ class spell_ex_5581 : public SpellScriptLoader // function called just before script delete // we free allocated memory - void Unload() + void Unload() OVERRIDE { delete localVariable2; } @@ -159,7 +159,7 @@ class spell_ex_5581 : public SpellScriptLoader } // register functions used in spell script - names of these functions do not matter - void Register() + void Register() OVERRIDE { // we're registering our functions here BeforeCast += SpellCastFn(spell_ex_5581SpellScript::HandleBeforeCast); @@ -192,7 +192,7 @@ class spell_ex_5581 : public SpellScriptLoader }; // function which creates SpellScript - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_ex_5581SpellScript(); } @@ -208,7 +208,7 @@ class spell_ex_66244 : public SpellScriptLoader PrepareAuraScript(spell_ex_66244AuraScript); // function called on server startup // checks if script has data required for it to work - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { // check if spellid exists in dbc, we will trigger it later if (!sSpellMgr->GetSpellInfo(SPELL_TRIGGERED)) @@ -218,7 +218,7 @@ class spell_ex_66244 : public SpellScriptLoader // function called in aura constructor // we initialize local variables if needed - bool Load() + bool Load() OVERRIDE { // do not load script if aura is casted by player or caster not avalible if (Unit* caster = GetCaster()) @@ -316,7 +316,7 @@ class spell_ex_66244 : public SpellScriptLoader } // function registering - void Register() + void Register() OVERRIDE { OnEffectApply += AuraEffectApplyFn(spell_ex_66244AuraScript::HandleOnEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectRemove += AuraEffectRemoveFn(spell_ex_66244AuraScript::HandleOnEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); @@ -347,7 +347,7 @@ class spell_ex_66244 : public SpellScriptLoader }; // function which creates AuraScript - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_ex_66244AuraScript(); } @@ -379,7 +379,7 @@ class spell_ex_absorb_aura : public SpellScriptLoader } // function registering - void Register() + void Register() OVERRIDE { OnEffectAbsorb += AuraEffectAbsorbFn(spell_ex_absorb_auraAuraScript::HandleOnEffectAbsorb, EFFECT_0); AfterEffectAbsorb += AuraEffectAbsorbFn(spell_ex_absorb_auraAuraScript::HandleAfterEffectAbsorb, EFFECT_0); @@ -387,7 +387,7 @@ class spell_ex_absorb_aura : public SpellScriptLoader }; // function which creates AuraScript - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_ex_absorb_auraAuraScript(); } @@ -408,14 +408,14 @@ class spell_ex_463 : public SpellScriptLoader // in our script we allow only players to be affected return target->GetTypeId() == TYPEID_PLAYER; } - void Register() + void Register() OVERRIDE { DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_ex_463AuraScript::CheckAreaTarget); } }; // function which creates AuraScript - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_ex_463AuraScript(); } @@ -440,18 +440,18 @@ class spell_ex : public SpellScriptLoader { PrepareSpellScript(spell_ex_SpellScript); - //bool Validate(SpellInfo const* spellEntry){return true;} + //bool Validate(SpellInfo const* spellEntry){return true;} OVERRIDE //bool Load(){return true;} //void Unload(){} //void Function(SpellEffIndex effIndex) //OnEffect += SpellEffectFn(spell_ex_SpellScript::Function, EFFECT_ANY, SPELL_EFFECT_ANY); //void Function() //OnHit += SpellEffectFn(spell_ex_SpellScript::Function); - void Register() + void Register() OVERRIDE { } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_ex_SpellScript(); } @@ -467,7 +467,7 @@ class spell_ex : public SpellScriptLoader class spell_ex_AuraScript : public AuraScript { PrepareAuraScript(spell_ex) - //bool Validate(SpellInfo const* spellEntry){return true;} + //bool Validate(SpellInfo const* spellEntry){return true;} OVERRIDE //bool Load(){return true;} //void Unload(){} @@ -478,12 +478,12 @@ class spell_ex : public SpellScriptLoader //void spell_ex_SpellScript::Function(AuraEffect const* aurEff, int32& amount, bool& canBeRecalculated) //DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_ex_SpellScript::Function, EFFECT_ANY, SPELL_AURA_ANY); //void spell_ex_SpellScript::Function(AuraEffect const* aurEff, bool& isPeriodic, int32& amplitude) //OnEffectCalcPeriodic += AuraEffectCalcPeriodicFn(spell_ex_SpellScript::Function, EFFECT_ANY, SPELL_AURA_ANY); //void spell_ex_SpellScript::Function(AuraEffect const* aurEff, SpellModifier*& spellMod) //OnEffectCalcSpellMod += AuraEffectCalcSpellModFn(spell_ex_SpellScript::Function, EFFECT_ANY, SPELL_AURA_ANY); - void Register() + void Register() OVERRIDE { } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_ex_AuraScript(); } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index 81e1136f94f..7872b42912f 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -40,7 +40,7 @@ class go_blackfathom_altar : public GameObjectScript public: go_blackfathom_altar() : GameObjectScript("go_blackfathom_altar") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) + bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE { if (!player->HasAura(SPELL_BLESSING_OF_BLACKFATHOM)) player->AddAura(SPELL_BLESSING_OF_BLACKFATHOM, player); @@ -53,7 +53,7 @@ class go_blackfathom_fire : public GameObjectScript public: go_blackfathom_fire() : GameObjectScript("go_blackfathom_fire") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE { InstanceScript* instance = go->GetInstanceScript(); @@ -73,7 +73,7 @@ class npc_blackfathom_deeps_event : public CreatureScript public: npc_blackfathom_deeps_event() : CreatureScript("npc_blackfathom_deeps_event") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_blackfathom_deeps_eventAI (creature); } @@ -99,7 +99,7 @@ public: bool Flee; - void Reset() + void Reset() OVERRIDE { Flee = false; @@ -132,7 +132,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -181,7 +181,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (me->IsSummon()) //we are not a normal spawn. if (instance) @@ -201,7 +201,7 @@ class npc_morridune : public CreatureScript public: npc_morridune() : CreatureScript("npc_morridune") { } - 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) @@ -214,7 +214,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_MORRIDUNE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -222,7 +222,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_morriduneAI (creature); } @@ -236,7 +236,7 @@ public: Start(false, false, 0); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp index 525f71b7d01..7f1909ce4a7 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp @@ -40,24 +40,24 @@ public: { boss_aku_maiAI(Creature* creature) : BossAI(creature, TYPE_AKU_MAI) { } - void Reset() + void Reset() OVERRIDE { IsEnraged = false; _Reset(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { events.ScheduleEvent(EVENT_POISON_CLOUD, urand(5000, 9000)); _EnterCombat(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -90,7 +90,7 @@ public: bool IsEnraged; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_aku_maiAI (creature); } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp index 4fa9edd40c6..9816bdc49da 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp @@ -29,7 +29,7 @@ class boss_gelihast : public CreatureScript public: boss_gelihast() : CreatureScript("boss_gelihast") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_gelihastAI (creature); } @@ -45,26 +45,26 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { netTimer = urand(2000, 4000); if (instance) instance->SetData(TYPE_GELIHAST, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) instance->SetData(TYPE_GELIHAST, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(TYPE_GELIHAST, DONE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp index 72992c477a8..4216935a946 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp @@ -34,7 +34,7 @@ class boss_kelris : public CreatureScript public: boss_kelris() : CreatureScript("boss_kelris") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_kelrisAI (creature); } @@ -51,7 +51,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { mindBlastTimer = urand(2000, 5000); sleepTimer = urand(9000, 12000); @@ -59,21 +59,21 @@ public: instance->SetData(TYPE_KELRIS, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); if (instance) instance->SetData(TYPE_KELRIS, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); if (instance) instance->SetData(TYPE_KELRIS, DONE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp index 2d64553454d..c403246cc04 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp @@ -57,7 +57,7 @@ class instance_blackfathom_deeps : public InstanceMapScript public: instance_blackfathom_deeps() : InstanceMapScript("instance_blackfathom_deeps", 48) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_blackfathom_deeps_InstanceMapScript(map); } @@ -142,7 +142,7 @@ public: } } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -212,7 +212,7 @@ public: } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -233,7 +233,7 @@ public: return 0; } - uint64 GetData64(uint32 data) const + uint64 GetData64(uint32 data) const OVERRIDE { switch (data) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index 7f6f779c60e..db74bd37c8d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -45,7 +45,7 @@ class boss_anetheron : public CreatureScript public: boss_anetheron() : CreatureScript("boss_anetheron") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_anetheronAI (creature); } @@ -64,7 +64,7 @@ public: uint32 InfernoTimer; bool go; - void Reset() + void Reset() OVERRIDE { damageTaken = 0; SwarmTimer = 45000; @@ -76,19 +76,19 @@ public: instance->SetData(DATA_ANETHERONEVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance && IsEvent) instance->SetData(DATA_ANETHERONEVENT, IN_PROGRESS); Talk(SAY_ONAGGRO); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_ONSLAY); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId == 7 && instance) { @@ -98,7 +98,7 @@ public: } } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { hyjal_trashAI::JustDied(killer); if (instance && IsEvent) @@ -106,7 +106,7 @@ public: Talk(SAY_ONDEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (IsEvent) { @@ -177,7 +177,7 @@ class npc_towering_infernal : public CreatureScript public: npc_towering_infernal() : CreatureScript("npc_towering_infernal") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_towering_infernalAI (creature); } @@ -196,32 +196,33 @@ public: uint64 AnetheronGUID; InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { DoCast(me, SPELL_INFERNO_EFFECT); ImmolationTimer = 5000; CheckTimer = 5000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (me->IsWithinDist(who, 50) && !me->IsInCombat() && me->IsValidAttackTarget(who)) AttackStart(who); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (CheckTimer <= diff) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 757206f7fe3..7450b500b46 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -81,7 +81,7 @@ class npc_ancient_wisp : public CreatureScript public: npc_ancient_wisp() : CreatureScript("npc_ancient_wisp") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ancient_wispAI(creature); } @@ -98,7 +98,7 @@ public: uint64 ArchimondeGUID; uint32 CheckTimer; - void Reset() + void Reset() OVERRIDE { CheckTimer = 1000; @@ -108,14 +108,14 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { damage = 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (CheckTimer <= diff) { @@ -139,7 +139,7 @@ class npc_doomfire : public CreatureScript public: npc_doomfire() : CreatureScript("npc_doomfire") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_doomfireAI(creature); } @@ -148,12 +148,13 @@ public: { npc_doomfireAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() { } + void Reset() OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) {} - void EnterCombat(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { damage = 0; } @@ -167,7 +168,7 @@ class npc_doomfire_targetting : public CreatureScript public: npc_doomfire_targetting() : CreatureScript("npc_doomfire_targetting") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_doomfire_targettingAI(creature); } @@ -179,13 +180,14 @@ public: uint64 TargetGUID; uint32 ChangeTargetTimer; - void Reset() + void Reset() OVERRIDE { TargetGUID = 0; ChangeTargetTimer = 5000; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { //will update once TargetGUID is 0. In case noone actually moves(not likely) and this is 0 //when UpdateAI needs it, it will be forced to select randomPoint @@ -193,14 +195,14 @@ public: TargetGUID = who->GetGUID(); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { damage = 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (ChangeTargetTimer <= diff) { @@ -235,7 +237,7 @@ class boss_archimonde : public CreatureScript public: boss_archimonde() : CreatureScript("boss_archimonde") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_archimondeAI (creature); } @@ -271,7 +273,7 @@ public: bool HasProtected; bool IsChanneling; - void Reset() + void Reset() OVERRIDE { if (instance) instance->SetData(DATA_ARCHIMONDEEVENT, NOT_STARTED); @@ -300,7 +302,7 @@ public: IsChanneling = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { me->InterruptSpell(CURRENT_CHANNELED_SPELL); Talk(SAY_AGGRO); @@ -310,7 +312,7 @@ public: instance->SetData(DATA_ARCHIMONDEEVENT, IN_PROGRESS); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { Talk(SAY_SLAY); @@ -343,7 +345,7 @@ public: ++SoulChargeCount; } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { hyjal_trashAI::JustDied(killer); Talk(SAY_DEATH); @@ -388,7 +390,7 @@ public: return false; } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned->GetEntry() == CREATURE_ANCIENT_WISP) summoned->AI()->AttackStart(me); @@ -465,7 +467,7 @@ public: SoulChargeTimer = urand(2000, 30000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!me->IsInCombat()) { @@ -636,7 +638,7 @@ public: DoMeleeAttackIfReady(); } - void WaypointReached(uint32 /*waypointId*/) { } + void WaypointReached(uint32 /*waypointId*/) OVERRIDE {} }; }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index da7ade178d6..a0aeab0fe84 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -46,7 +46,7 @@ class boss_azgalor : public CreatureScript public: boss_azgalor() : CreatureScript("boss_azgalor") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_azgalorAI (creature); } @@ -68,7 +68,7 @@ public: bool go; - void Reset() + void Reset() OVERRIDE { damageTaken = 0; RainTimer = 20000; @@ -82,19 +82,19 @@ public: instance->SetData(DATA_AZGALOREVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance && IsEvent) instance->SetData(DATA_AZGALOREVENT, IN_PROGRESS); Talk(SAY_ONAGGRO); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_ONSLAY); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId == 7 && instance) { @@ -104,7 +104,7 @@ public: } } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { hyjal_trashAI::JustDied(killer); if (instance && IsEvent) @@ -112,7 +112,7 @@ public: Talk(SAY_ONDEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (IsEvent) { @@ -184,7 +184,7 @@ class npc_lesser_doomguard : public CreatureScript public: npc_lesser_doomguard() : CreatureScript("npc_lesser_doomguard") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_lesser_doomguardAI (creature); } @@ -204,7 +204,7 @@ public: uint64 AzgalorGUID; InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { CrippleTimer = 50000; WarstompTimer = 10000; @@ -212,29 +212,30 @@ public: CheckTimer = 5000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { } - void WaypointReached(uint32 /*waypointId*/) + void WaypointReached(uint32 /*waypointId*/) OVERRIDE { } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (me->IsWithinDist(who, 50) && !me->IsInCombat() && me->IsValidAttackTarget(who)) AttackStart(who); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (CheckTimer <= diff) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index c24eda9b38e..a5fa3f6485f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -47,7 +47,7 @@ class boss_kazrogal : public CreatureScript public: boss_kazrogal() : CreatureScript("boss_kazrogal") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_kazrogalAI (creature); } @@ -66,7 +66,7 @@ public: uint32 MarkTimerBase; bool go; - void Reset() + void Reset() OVERRIDE { damageTaken = 0; CleaveTimer = 5000; @@ -78,19 +78,19 @@ public: instance->SetData(DATA_KAZROGALEVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance && IsEvent) instance->SetData(DATA_KAZROGALEVENT, IN_PROGRESS); Talk(SAY_ONAGGRO); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_ONSLAY); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId == 7 && instance) { @@ -100,7 +100,7 @@ public: } } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { hyjal_trashAI::JustDied(killer); if (instance && IsEvent) @@ -108,7 +108,7 @@ public: DoPlaySoundToSet(me, SOUND_ONDEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (IsEvent) { @@ -191,7 +191,7 @@ class spell_mark_of_kazrogal : public SpellScriptLoader targets.remove_if(MarkTargetFilter()); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mark_of_kazrogal_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } @@ -201,7 +201,7 @@ class spell_mark_of_kazrogal : public SpellScriptLoader { PrepareAuraScript(spell_mark_of_kazrogal_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MARK_DAMAGE)) return false; @@ -220,7 +220,7 @@ class spell_mark_of_kazrogal : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_mark_of_kazrogal_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_MANA_LEECH); } @@ -231,7 +231,7 @@ class spell_mark_of_kazrogal : public SpellScriptLoader return new spell_mark_of_kazrogal_SpellScript(); } - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mark_of_kazrogal_AuraScript(); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp index 966aed69374..71d832c6970 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -42,7 +42,7 @@ class boss_rage_winterchill : public CreatureScript public: boss_rage_winterchill() : CreatureScript("boss_rage_winterchill") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_rage_winterchillAI (creature); } @@ -61,7 +61,7 @@ public: uint32 IceboltTimer; bool go; - void Reset() + void Reset() OVERRIDE { damageTaken = 0; FrostArmorTimer = 37000; @@ -73,19 +73,19 @@ public: instance->SetData(DATA_RAGEWINTERCHILLEVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance && IsEvent) instance->SetData(DATA_RAGEWINTERCHILLEVENT, IN_PROGRESS); Talk(SAY_ONAGGRO); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_ONSLAY); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId == 7 && instance) { @@ -95,7 +95,7 @@ public: } } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { hyjal_trashAI::JustDied(killer); if (instance && IsEvent) @@ -103,7 +103,7 @@ public: Talk(SAY_ONDEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (IsEvent) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp index 8445b4fc6c0..336bee39da5 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp @@ -53,7 +53,7 @@ class npc_jaina_proudmoore : public CreatureScript public: npc_jaina_proudmoore() : CreatureScript("npc_jaina_proudmoore") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); @@ -78,7 +78,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); if (ai->EventBegun) @@ -100,7 +100,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { hyjalAI* ai = new hyjalAI(creature); @@ -129,7 +129,7 @@ class npc_thrall : public CreatureScript public: npc_thrall() : CreatureScript("npc_thrall") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); @@ -155,7 +155,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); if (ai->EventBegun) @@ -182,7 +182,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { hyjalAI* ai = new hyjalAI(creature); @@ -207,7 +207,7 @@ class npc_tyrande_whisperwind : public CreatureScript public: npc_tyrande_whisperwind() : CreatureScript("npc_tyrande_whisperwind") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { hyjalAI* ai = new hyjalAI(creature); ai->Reset(); @@ -215,7 +215,7 @@ public: return ai; } - 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) @@ -231,7 +231,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { hyjalAI* ai = CAST_AI(hyjalAI, creature->AI()); uint32 AzgalorEvent = ai->GetInstanceData(DATA_AZGALOREVENT); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index f6a12103824..24d0422e06e 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -436,16 +436,16 @@ public: uint32 FlameBuffetTimer; bool imol; - void Reset() + void Reset() OVERRIDE { spawnTimer = 2000; FlameBuffetTimer= 2000; imol = false; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId == 0 && instance && !IsOverrun) { @@ -458,7 +458,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (Delay <= diff) { @@ -535,7 +535,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_giant_infernalAI(creature); } @@ -546,7 +546,7 @@ class npc_abomination : public CreatureScript public: npc_abomination() : CreatureScript("npc_abomination") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_abominationAI(creature); } @@ -562,12 +562,12 @@ public: bool go; uint32 KnockDownTimer; - void Reset() + void Reset() OVERRIDE { KnockDownTimer = 10000; } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId == 7 && instance && !IsOverrun) { @@ -594,9 +594,9 @@ public: } } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { hyjal_trashAI::UpdateAI(diff); if (IsEvent || IsOverrun) @@ -644,7 +644,7 @@ class npc_ghoul : public CreatureScript public: npc_ghoul() : CreatureScript("npc_ghoul") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ghoulAI(creature); } @@ -662,14 +662,14 @@ public: uint32 FrenzyTimer; uint32 MoveTimer; bool RandomMove; - void Reset() + void Reset() OVERRIDE { FrenzyTimer = 5000+rand()%5000; MoveTimer = 2000; RandomMove = false; } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId == 7 && instance && !IsOverrun) { @@ -697,9 +697,9 @@ public: } } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { hyjal_trashAI::UpdateAI(diff); if (IsEvent || IsOverrun) @@ -746,7 +746,7 @@ class npc_necromancer : public CreatureScript public: npc_necromancer() : CreatureScript("npc_necromancer") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_necromancerAI(creature); } @@ -764,13 +764,13 @@ public: bool go; uint32 ShadowBoltTimer; - void Reset() + void Reset() OVERRIDE { ShadowBoltTimer = 1000+rand()%5000; summons.DespawnAll(); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true); if (target) @@ -778,12 +778,12 @@ public: summons.Summon(summon); } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { summons.Despawn(summon); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId == 7 && instance && !IsOverrun) { @@ -802,7 +802,7 @@ public: } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { switch (urand(0, 2)) { @@ -820,9 +820,9 @@ public: } } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { hyjal_trashAI::UpdateAI(diff); @@ -873,7 +873,7 @@ class npc_banshee : public CreatureScript public: npc_banshee() : CreatureScript("npc_banshee") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_bansheeAI(creature); } @@ -892,14 +892,14 @@ public: uint32 WailTimer; uint32 ShellTimer; - void Reset() + void Reset() OVERRIDE { CourseTimer = 20000+rand()%5000; WailTimer = 15000+rand()%5000; ShellTimer = 50000+rand()%10000; } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId == 7 && instance && !IsOverrun) { @@ -918,9 +918,9 @@ public: } } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { hyjal_trashAI::UpdateAI(diff); if (IsEvent || IsOverrun) @@ -976,7 +976,7 @@ class npc_crypt_fiend : public CreatureScript public: npc_crypt_fiend() : CreatureScript("npc_crypt_fiend") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_crypt_fiendAI(creature); } @@ -993,12 +993,12 @@ public: bool go; uint32 WebTimer; - void Reset() + void Reset() OVERRIDE { WebTimer = 20000+rand()%5000; } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId == 7 && instance && !IsOverrun) { @@ -1017,9 +1017,9 @@ public: } } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { hyjal_trashAI::UpdateAI(diff); if (IsEvent || IsOverrun) @@ -1066,7 +1066,7 @@ class npc_fel_stalker : public CreatureScript public: npc_fel_stalker() : CreatureScript("npc_fel_stalker") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_fel_stalkerAI(creature); } @@ -1083,12 +1083,12 @@ public: bool go; uint32 ManaBurnTimer; - void Reset() + void Reset() OVERRIDE { ManaBurnTimer = 9000+rand()%5000; } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId == 7 && instance && !IsOverrun) { @@ -1107,9 +1107,9 @@ public: } } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { hyjal_trashAI::UpdateAI(diff); if (IsEvent || IsOverrun) @@ -1156,7 +1156,7 @@ class npc_frost_wyrm : public CreatureScript public: npc_frost_wyrm() : CreatureScript("npc_frost_wyrm") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_frost_wyrmAI(creature); } @@ -1174,14 +1174,14 @@ public: uint32 FrostBreathTimer; uint32 MoveTimer; - void Reset() + void Reset() OVERRIDE { FrostBreathTimer = 5000; MoveTimer = 0; me->SetDisableGravity(true); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId == 2 && instance && !IsOverrun) { @@ -1194,7 +1194,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance && IsEvent) instance->SetData(DATA_TRASH, 0);//signal trash is dead @@ -1206,9 +1206,9 @@ public: me->SetPosition(x, y, z, 0); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { hyjal_trashAI::UpdateAI(diff); if (IsEvent || IsOverrun) @@ -1268,7 +1268,7 @@ class npc_gargoyle : public CreatureScript public: npc_gargoyle() : CreatureScript("npc_gargoyle") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_gargoyleAI(creature); } @@ -1289,7 +1289,7 @@ public: float Zpos; bool forcemove; - void Reset() + void Reset() OVERRIDE { forcemove = true; Zpos = 10.0f; @@ -1298,7 +1298,7 @@ public: me->SetDisableGravity(true); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (waypointId == 2 && instance && !IsOverrun) { @@ -1311,7 +1311,7 @@ public: } } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { float x, y, z; me->GetPosition(x, y, z); @@ -1321,7 +1321,7 @@ public: hyjal_trashAI::JustDied(killer); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { hyjal_trashAI::UpdateAI(diff); if (IsEvent || IsOverrun) @@ -1403,7 +1403,7 @@ class alliance_rifleman : public CreatureScript public: alliance_rifleman() : CreatureScript("alliance_rifleman") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new alliance_riflemanAI(creature); } @@ -1417,16 +1417,17 @@ public: uint32 ExplodeTimer; - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { } - void Reset() + void Reset() OVERRIDE { ExplodeTimer = 5000+rand()%5000; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!who || me->GetVictim()) return; @@ -1439,11 +1440,11 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Check if we have a target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp index abe6da8e363..8a96a8fa3fc 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp @@ -50,7 +50,7 @@ class instance_hyjal : public InstanceMapScript public: instance_hyjal() : InstanceMapScript("instance_hyjal", 534) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_mount_hyjal_InstanceMapScript(map); } @@ -159,7 +159,7 @@ public: } } - uint64 GetData64(uint32 identifier) const + uint64 GetData64(uint32 identifier) const OVERRIDE { switch (identifier) { @@ -176,7 +176,7 @@ public: return 0; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -296,7 +296,7 @@ public: } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp index adc2ad1c6ac..b365b09b3c3 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp @@ -50,7 +50,7 @@ class boss_epoch : public CreatureScript public: boss_epoch() : CreatureScript("boss_epoch") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_epochAI (creature); } @@ -72,7 +72,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiStep = 1; uiStepTimer = 26000; @@ -85,7 +85,7 @@ public: instance->SetData(DATA_EPOCH_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -93,7 +93,7 @@ public: instance->SetData(DATA_EPOCH_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -128,7 +128,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -136,7 +136,7 @@ public: instance->SetData(DATA_EPOCH_EVENT, DONE); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp index 262f8a76509..54438e3b8a9 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp @@ -37,7 +37,7 @@ class boss_infinite_corruptor : public CreatureScript public: boss_infinite_corruptor() : CreatureScript("boss_infinite_corruptor") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_infinite_corruptorAI(creature); } @@ -51,20 +51,20 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { if (instance) instance->SetData(DATA_INFINITE_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_INFINITE_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -73,7 +73,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); if (instance) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp index 6c945e4d2b2..bba812989ce 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp @@ -64,7 +64,7 @@ class boss_mal_ganis : public CreatureScript public: boss_mal_ganis() : CreatureScript("boss_mal_ganis") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_mal_ganisAI (creature); } @@ -91,7 +91,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { bYelled = false; bYelled2 = false; @@ -106,20 +106,20 @@ public: instance->SetData(DATA_MAL_GANIS_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_MAL_GANIS_EVENT, IN_PROGRESS); } - void DamageTaken(Unit* done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE { if (damage >= me->GetHealth() && done_by != me) damage = me->GetHealth()-1; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { switch (Phase) { @@ -226,7 +226,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -237,7 +237,7 @@ public: } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp index 68f2fe1992b..32499b1bef5 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp @@ -49,7 +49,7 @@ class boss_meathook : public CreatureScript public: boss_meathook() : CreatureScript("boss_meathook") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_meathookAI (creature); } @@ -69,7 +69,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiChainTimer = urand(12000, 17000); //seen on video 13, 17, 15, 12, 16 uiDiseaseTimer = urand(2000, 4000); //approx 3s @@ -79,7 +79,7 @@ public: instance->SetData(DATA_MEATHOOK_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -87,7 +87,7 @@ public: instance->SetData(DATA_MEATHOOK_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -115,7 +115,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -123,7 +123,7 @@ public: instance->SetData(DATA_MEATHOOK_EVENT, DONE); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp index ba4439907ba..fd63822fea3 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp @@ -54,7 +54,7 @@ class boss_salramm : public CreatureScript public: boss_salramm() : CreatureScript("boss_salramm") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_salrammAI (creature); } @@ -76,7 +76,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiCurseFleshTimer = 30000; //30s DBM uiExplodeGhoulTimer = urand(25000, 28000); //approx 6 sec after summon ghouls @@ -88,7 +88,7 @@ public: instance->SetData(DATA_SALRAMM_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -96,7 +96,7 @@ public: instance->SetData(DATA_SALRAMM_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -138,7 +138,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -146,7 +146,7 @@ public: instance->SetData(DATA_SALRAMM_EVENT, DONE); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index dfaec601b58..dbead663cff 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -255,7 +255,7 @@ class npc_arthas : public CreatureScript public: npc_arthas() : CreatureScript("npc_arthas") { } - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) + bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); npc_arthasAI* ai = CAST_AI(npc_arthas::npc_arthasAI, creature->AI()); @@ -298,7 +298,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { npc_arthasAI* ai = CAST_AI(npc_arthas::npc_arthasAI, creature->AI()); @@ -342,7 +342,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_arthasAI(creature); } @@ -379,7 +379,7 @@ public: uint32 exorcismTimer; - void Reset() + void Reset() OVERRIDE { utherGUID = 0; jainaGUID = 0; @@ -417,12 +417,12 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoCast(me, SPELL_ARTHAS_AURA); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_ARTHAS_EVENT, FAIL); @@ -470,7 +470,7 @@ public: ++step; } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -589,7 +589,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { npc_escortAI::UpdateAI(diff); @@ -1243,7 +1243,7 @@ class npc_crate_helper : public CreatureScript _marked = false; } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_ARCANE_DISRUPTION && !_marked) { @@ -1262,7 +1262,7 @@ class npc_crate_helper : public CreatureScript bool _marked; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_crate_helperAI(creature); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp index 30ef1427d63..7df66c89594 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp @@ -45,7 +45,7 @@ class instance_culling_of_stratholme : public InstanceMapScript public: instance_culling_of_stratholme() : InstanceMapScript("instance_culling_of_stratholme", 595) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_culling_of_stratholme_InstanceMapScript(map); } @@ -143,7 +143,7 @@ class instance_culling_of_stratholme : public InstanceMapScript } } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -198,7 +198,7 @@ class instance_culling_of_stratholme : public InstanceMapScript SaveToDB(); } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -218,7 +218,7 @@ class instance_culling_of_stratholme : public InstanceMapScript return 0; } - uint64 GetData64(uint32 identifier) const + uint64 GetData64(uint32 identifier) const OVERRIDE { switch (identifier) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp index 31e3c033833..056dc887c68 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp @@ -52,7 +52,7 @@ class boss_captain_skarloc : public CreatureScript public: boss_captain_skarloc() : CreatureScript("boss_captain_skarloc") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_captain_skarlocAI (creature); } @@ -73,7 +73,7 @@ public: uint32 DevotionAura_Timer; uint32 Consecration_Timer; - void Reset() + void Reset() OVERRIDE { Holy_Light_Timer = urand(20000, 30000); Cleanse_Timer = 10000; @@ -83,19 +83,19 @@ public: Consecration_Timer = 8000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { //This is not correct. Should taunt Thrall before engage in combat Talk(SAY_TAUNT1); Talk(SAY_TAUNT2); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -103,7 +103,7 @@ public: instance->SetData(TYPE_THRALL_PART1, DONE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp index 4352740e6f4..1e08d4d6bac 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -50,7 +50,7 @@ class boss_epoch_hunter : public CreatureScript public: boss_epoch_hunter() : CreatureScript("boss_epoch_hunter") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_epoch_hunterAI (creature); } @@ -69,7 +69,7 @@ public: uint32 WingBuffet_Timer; uint32 Mda_Timer; - void Reset() + void Reset() OVERRIDE { SandBreath_Timer = urand(8000, 16000); ImpendingDeath_Timer = urand(25000, 30000); @@ -77,17 +77,17 @@ public: Mda_Timer = 40000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -95,7 +95,7 @@ public: instance->SetData(TYPE_THRALL_PART4, DONE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp index db2d965f761..337d1f45aba 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp @@ -37,7 +37,7 @@ class go_barrel_old_hillsbrad : public GameObjectScript public: go_barrel_old_hillsbrad() : GameObjectScript("go_barrel_old_hillsbrad") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE { if (InstanceScript* instance = go->GetInstanceScript()) { @@ -107,7 +107,7 @@ class boss_lieutenant_drake : public CreatureScript public: boss_lieutenant_drake() : CreatureScript("boss_lieutenant_drake") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_lieutenant_drakeAI (creature); } @@ -124,7 +124,7 @@ public: uint32 MortalStrike_Timer; uint32 ExplodingShout_Timer; - void Reset() + void Reset() OVERRIDE { CanPatrol = true; wpId = 0; @@ -135,22 +135,22 @@ public: ExplodingShout_Timer = 25000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { /// @todo make this work if (CanPatrol && wpId == 0) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp index a488d8de86f..add2c57335a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -45,7 +45,7 @@ class instance_old_hillsbrad : public InstanceMapScript public: instance_old_hillsbrad() : InstanceMapScript("instance_old_hillsbrad", 560) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_old_hillsbrad_InstanceMapScript(map); } @@ -120,7 +120,7 @@ public: } } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { Player* player = GetPlayerInMap(); @@ -203,7 +203,7 @@ public: } } - uint32 GetData(uint32 data) const + uint32 GetData(uint32 data) const OVERRIDE { switch (data) { @@ -223,7 +223,7 @@ public: return 0; } - uint64 GetData64(uint32 data) const + uint64 GetData64(uint32 data) const OVERRIDE { switch (data) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index ba0cf93e5dd..ffa0eea14f6 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -56,7 +56,7 @@ class npc_erozion : public CreatureScript public: npc_erozion() : CreatureScript("npc_erozion") { } - 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) @@ -76,7 +76,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -186,12 +186,12 @@ class npc_thrall_old_hillsbrad : public CreatureScript public: npc_thrall_old_hillsbrad() : CreatureScript("npc_thrall_old_hillsbrad") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_thrall_old_hillsbradAI(creature); } - 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(); @@ -241,7 +241,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) { @@ -289,7 +289,7 @@ public: bool LowHp; bool HadMount; - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (!instance) return; @@ -458,7 +458,7 @@ public: } } - void Reset() + void Reset() OVERRIDE { LowHp = false; @@ -493,7 +493,7 @@ public: me->Dismount(); me->SetSpeed(MOVE_RUN, SPEED_RUN); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_TH_RANDOM_AGGRO); if (me->IsMounted()) @@ -503,7 +503,7 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { switch (summoned->GetEntry()) { @@ -520,11 +520,11 @@ public: } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_TH_RANDOM_KILL); } - void JustDied(Unit* slayer) + void JustDied(Unit* slayer) OVERRIDE { if (instance) instance->SetData(TYPE_THRALL_EVENT, FAIL); @@ -536,7 +536,7 @@ public: Talk(SAY_TH_RANDOM_DIE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { npc_escortAI::UpdateAI(diff); @@ -571,12 +571,12 @@ class npc_taretha : public CreatureScript public: npc_taretha() : CreatureScript("npc_taretha") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_tarethaAI(creature); } - 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(); @@ -606,7 +606,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(TYPE_THRALL_PART3) == DONE && instance->GetData(TYPE_THRALL_PART4) == NOT_STARTED) @@ -626,7 +626,7 @@ public: InstanceScript* instance; - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -639,10 +639,10 @@ public: } } - void Reset() {} - void EnterCombat(Unit* /*who*/) {} + void Reset() OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { npc_escortAI::UpdateAI(diff); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp index 39428e07fd8..1b3311500c9 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_aeonus.cpp @@ -59,9 +59,9 @@ public: { boss_aeonusAI(Creature* creature) : BossAI(creature, TYPE_AEONUS) { } - void Reset() { } + void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { events.ScheduleEvent(EVENT_SANDBREATH, urand(15000, 30000)); events.ScheduleEvent(EVENT_TIMESTOP, urand(10000, 15000)); @@ -70,7 +70,8 @@ public: Talk(SAY_AGGRO); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { //Despawn Time Keeper if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_TIME_KEEPER) @@ -85,7 +86,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -96,12 +97,12 @@ public: } } - 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()) @@ -137,7 +138,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_aeonusAI (creature); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp index bd217ce51ee..f411e24b283 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp @@ -60,9 +60,9 @@ public: { boss_chrono_lord_dejaAI(Creature* creature) : BossAI(creature, TYPE_CRONO_LORD_DEJA) { } - void Reset() { } + void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { events.ScheduleEvent(EVENT_ARCANE_BLAST, urand(18000, 23000)); events.ScheduleEvent(EVENT_TIME_LAPSE, urand(10000, 15000)); @@ -73,7 +73,8 @@ public: Talk(SAY_AGGRO); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { //Despawn Time Keeper if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_TIME_KEEPER) @@ -88,12 +89,12 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -101,7 +102,7 @@ public: instance->SetData(TYPE_RIFT, SPECIAL); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -142,7 +143,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_chrono_lord_dejaAI (creature); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp index f679fa4ee62..eeec1f58a0a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp @@ -59,9 +59,9 @@ public: { boss_temporusAI(Creature* creature) : BossAI(creature, TYPE_TEMPORUS) { } - void Reset() { } + void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { events.ScheduleEvent(EVENT_HASTE, urand(15000, 23000)); events.ScheduleEvent(EVENT_MORTAL_WOUND, 8000); @@ -72,12 +72,12 @@ public: Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -85,7 +85,8 @@ public: instance->SetData(TYPE_RIFT, SPECIAL); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { //Despawn Time Keeper if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_TIME_KEEPER) @@ -101,7 +102,7 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -140,7 +141,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_temporusAI (creature); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp index 7d76cce6ddb..003207eeecf 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp @@ -73,7 +73,7 @@ class instance_the_black_morass : public InstanceMapScript public: instance_the_black_morass() : InstanceMapScript("instance_the_black_morass", 269) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_the_black_morass_InstanceMapScript(map); } @@ -165,7 +165,7 @@ public: } } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -236,7 +236,7 @@ public: } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -252,7 +252,7 @@ public: return 0; } - uint64 GetData64(uint32 data) const + uint64 GetData64(uint32 data) const OVERRIDE { if (data == DATA_MEDIVH) return _medivhGUID; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp index d27b4b330b4..6c12dcd5e18 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp @@ -68,7 +68,7 @@ class npc_medivh_bm : public CreatureScript public: npc_medivh_bm() : CreatureScript("npc_medivh_bm") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_medivh_bmAI (creature); } @@ -89,7 +89,7 @@ public: bool Life50; bool Life25; - void Reset() + void Reset() OVERRIDE { SpellCorrupt_Timer = 0; @@ -104,7 +104,8 @@ public: DoCast(me, SPELL_PORTAL_RUNE, true); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!instance) return; @@ -138,7 +139,7 @@ public: } } - void AttackStart(Unit* /*who*/) + void AttackStart(Unit* /*who*/) OVERRIDE { //if (instance && instance->GetData(TYPE_MEDIVH) == IN_PROGRESS) //return; @@ -146,9 +147,9 @@ public: //ScriptedAI::AttackStart(who); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE { if (SpellCorrupt_Timer) return; @@ -160,7 +161,7 @@ public: SpellCorrupt_Timer = 3000; } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (killer->GetEntry() == me->GetEntry()) return; @@ -168,7 +169,7 @@ public: Talk(SAY_DEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!instance) return; @@ -261,7 +262,7 @@ class npc_time_rift : public CreatureScript public: npc_time_rift() : CreatureScript("npc_time_rift") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_time_riftAI (creature); } @@ -280,7 +281,7 @@ public: uint8 mPortalCount; uint8 mWaveId; - void Reset() + void Reset() OVERRIDE { TimeRiftWave_Timer = 15000; @@ -298,7 +299,7 @@ public: else mWaveId = 1; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} void DoSummonAtRift(uint32 creature_entry) { @@ -342,7 +343,7 @@ public: } else DoSummonAtRift(entry); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!instance) return; @@ -379,7 +380,7 @@ class npc_saat : public CreatureScript public: npc_saat() : CreatureScript("npc_saat") { } - 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) @@ -390,7 +391,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp index 695f9d2973e..687b29353f9 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp @@ -38,7 +38,7 @@ class celebras_the_cursed : public CreatureScript public: celebras_the_cursed() : CreatureScript("celebras_the_cursed") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new celebras_the_cursedAI (creature); } @@ -51,21 +51,21 @@ public: uint32 EntanglingRootsTimer; uint32 CorruptForcesTimer; - void Reset() + void Reset() OVERRIDE { WrathTimer = 8000; EntanglingRootsTimer = 2000; CorruptForcesTimer = 30000; } - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { me->SummonCreature(13716, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 600000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp index eea34e1949f..ddfc918f95f 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_landslide.cpp @@ -38,7 +38,7 @@ class boss_landslide : public CreatureScript public: boss_landslide() : CreatureScript("boss_landslide") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_landslideAI (creature); } @@ -51,18 +51,18 @@ public: uint32 TrampleTimer; uint32 LandslideTimer; - void Reset() + void Reset() OVERRIDE { KnockAwayTimer = 8000; TrampleTimer = 2000; LandslideTimer = 0; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp index 73c3fc179d3..64751e886e5 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp @@ -37,7 +37,7 @@ class boss_noxxion : public CreatureScript public: boss_noxxion() : CreatureScript("boss_noxxion") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_noxxionAI (creature); } @@ -52,7 +52,7 @@ public: uint32 InvisibleTimer; bool Invisible; - void Reset() + void Reset() OVERRIDE { ToxicVolleyTimer = 7000; UppercutTimer = 16000; @@ -61,7 +61,7 @@ public: Invisible = false; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} void SummonAdds(Unit* victim) { @@ -69,7 +69,7 @@ public: Add->AI()->AttackStart(victim); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (Invisible && InvisibleTimer <= diff) { diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp index ddce2f658e7..fbe208df07c 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp @@ -40,7 +40,7 @@ class boss_princess_theradras : public CreatureScript public: boss_princess_theradras() : CreatureScript("boss_princess_theradras") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_ptheradrasAI (creature); } @@ -54,7 +54,7 @@ public: uint32 ThrashTimer; uint32 RepulsiveGazeTimer; - void Reset() + void Reset() OVERRIDE { DustfieldTimer = 8000; BoulderTimer = 2000; @@ -62,14 +62,14 @@ public: RepulsiveGazeTimer = 23000; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { me->SummonCreature(12238, 28.067f, 61.875f, -123.405f, 4.67f, TEMPSUMMON_TIMED_DESPAWN, 600000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 39df89892cf..62c912021a9 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -113,7 +113,7 @@ class boss_onyxia : public CreatureScript public: boss_onyxia() : CreatureScript("boss_onyxia") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_onyxiaAI (creature); } @@ -150,7 +150,7 @@ public: uint8 SummonWhelpCount; bool IsMoving; - void Reset() + void Reset() OVERRIDE { if (!IsCombatMovementAllowed()) SetCombatMovement(true); @@ -185,7 +185,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); me->SetInCombatWithZone(); @@ -197,7 +197,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_ONYXIA, DONE); @@ -205,7 +205,7 @@ public: Summons.DespawnAll(); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->SetInCombatWithZone(); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) @@ -223,17 +223,17 @@ public: Summons.Summon(summoned); } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { Summons.Despawn(summon); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void SpellHit(Unit* /*pCaster*/, const SpellInfo* Spell) + void SpellHit(Unit* /*pCaster*/, const SpellInfo* Spell) OVERRIDE { if (Spell->Id == SPELL_BREATH_EAST_TO_WEST || Spell->Id == SPELL_BREATH_WEST_TO_EAST || @@ -250,7 +250,7 @@ public: } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type == POINT_MOTION_TYPE) { @@ -293,7 +293,7 @@ public: } } - void SpellHitTarget(Unit* target, const SpellInfo* Spell) + void SpellHitTarget(Unit* target, const SpellInfo* Spell) OVERRIDE { //Workaround - Couldn't find a way to group this spells (All Eruption) if (((Spell->Id >= 17086 && Spell->Id <= 17095) || @@ -341,7 +341,7 @@ public: MovePoint = iTemp; } - void UpdateAI(uint32 Diff) + void UpdateAI(uint32 Diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp index a779186a5c8..6ae8a2ef709 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp @@ -36,7 +36,7 @@ class instance_onyxias_lair : public InstanceMapScript public: instance_onyxias_lair() : InstanceMapScript("instance_onyxias_lair", 249) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_onyxias_lair_InstanceMapScript(map); } @@ -145,7 +145,7 @@ public: FloorEruptionGUID[1].erase(floorEruptedGUID); } - void SetData(uint32 Type, uint32 Data) + void SetData(uint32 Type, uint32 Data) OVERRIDE { switch (Type) { @@ -178,7 +178,7 @@ public: SaveToDB(); } - void SetData64(uint32 Type, uint64 Data) + void SetData64(uint32 Type, uint64 Data) OVERRIDE { switch (Type) { @@ -190,7 +190,7 @@ public: } } - uint32 GetData(uint32 Type) const + uint32 GetData(uint32 Type) const OVERRIDE { switch (Type) { @@ -201,7 +201,7 @@ public: return 0; } - uint64 GetData64(uint32 Data) const + uint64 GetData64(uint32 Data) const OVERRIDE { switch (Data) { diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp index 46ef908bf37..7d173ea5955 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp @@ -45,7 +45,7 @@ class boss_amnennar_the_coldbringer : public CreatureScript public: boss_amnennar_the_coldbringer() : CreatureScript("boss_amnennar_the_coldbringer") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_amnennar_the_coldbringerAI (creature); } @@ -61,7 +61,7 @@ public: bool Spectrals30; bool Hp; - void Reset() + void Reset() OVERRIDE { AmnenarsWrath_Timer = 8000; FrostBolt_Timer = 1000; @@ -71,17 +71,17 @@ public: Hp = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp index 58c9731814d..0284cdfce62 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp @@ -28,7 +28,7 @@ class instance_razorfen_downs : public InstanceMapScript public: instance_razorfen_downs() : InstanceMapScript("instance_razorfen_downs", 129) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_razorfen_downs_InstanceMapScript(map); } @@ -115,7 +115,7 @@ public: } } - void SetData(uint32 uiType, uint32 uiData) + void SetData(uint32 uiType, uint32 uiData) OVERRIDE { if (uiType == DATA_GONG_WAVES) { @@ -187,7 +187,7 @@ public: } } - uint32 GetData(uint32 uiType) const + uint32 GetData(uint32 uiType) const OVERRIDE { switch (uiType) { @@ -198,7 +198,7 @@ public: return 0; } - uint64 GetData64(uint32 uiType) const + uint64 GetData64(uint32 uiType) const OVERRIDE { switch (uiType) { diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp index 7d7e050f010..a49b4477f20 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp @@ -59,7 +59,7 @@ class npc_henry_stern : public CreatureScript public: npc_henry_stern() : CreatureScript("npc_henry_stern") { } - 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) @@ -77,7 +77,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetBaseSkillValue(SKILL_COOKING) >= 175 && !player->HasSpell(SPELL_GOLDTHORN_TEA)) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -99,7 +99,7 @@ class go_gong : public GameObjectScript public: go_gong() : GameObjectScript("go_gong") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE { //basic support, not blizzlike data is missing... InstanceScript* instance = go->GetInstanceScript(); @@ -125,7 +125,7 @@ class npc_tomb_creature : public CreatureScript public: npc_tomb_creature() : CreatureScript("npc_tomb_creature") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_tomb_creatureAI (creature); } @@ -141,12 +141,12 @@ public: uint32 uiWebTimer; - void Reset() + void Reset() OVERRIDE { uiWebTimer = urand(5000, 8000); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (!UpdateVictim()) return; @@ -164,7 +164,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_GONG_WAVES, instance->GetData(DATA_GONG_WAVES)+1); diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp index 242a1c4258b..dc2995540df 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp @@ -35,7 +35,7 @@ class instance_razorfen_kraul : public InstanceMapScript public: instance_razorfen_kraul() : InstanceMapScript("instance_razorfen_kraul", 47) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_razorfen_kraul_InstanceMapScript(map); } @@ -88,7 +88,7 @@ public: } } - void SetData(uint32 type, uint32 /*data*/) + void SetData(uint32 type, uint32 /*data*/) OVERRIDE { switch (type) { diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp index ea669f96efc..13ce8e8c964 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp @@ -47,7 +47,7 @@ class npc_willix : public CreatureScript public: npc_willix() : CreatureScript("npc_willix") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_WILLIX_THE_IMPORTER) { @@ -59,7 +59,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_willixAI(creature); } @@ -68,7 +68,7 @@ public: { npc_willixAI(Creature* creature) : npc_escortAI(creature) {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -118,19 +118,19 @@ public: } } - void Reset() {} + void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO1); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Player* player = GetPlayerForEscort()) player->FailQuest(QUEST_WILLIX_THE_IMPORTER); @@ -164,7 +164,7 @@ struct npc_snufflenose_gopher : public CreatureScript public: npc_snufflenose_gopher() : CreatureScript("npc_snufflenose_gopher") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_snufflenose_gopherAI(creature); } @@ -173,12 +173,12 @@ public: { npc_snufflenose_gopherAI(Creature* creature) : PetAI(creature) { } - void Reset() + void Reset() OVERRIDE { IsMovementActive = false; } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type == POINT_MOTION_TYPE && id == POINT_TUBBER) { @@ -227,13 +227,13 @@ public: IsMovementActive = true; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!IsMovementActive) PetAI::UpdateAI(diff); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_FIND_NEW_TUBBER) DoFindNewTubber(); @@ -254,7 +254,7 @@ class spell_snufflenose_command : public SpellScriptLoader { PrepareSpellScript(spell_snufflenose_commandSpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -266,13 +266,13 @@ class spell_snufflenose_command : public SpellScriptLoader target->ToCreature()->AI()->DoAction(ACTION_FIND_NEW_TUBBER); } - void Register() + void Register() OVERRIDE { AfterCast += SpellCastFn(spell_snufflenose_commandSpellScript::HandleAfterCast); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_snufflenose_commandSpellScript(); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp index be867ecc33c..327fe0d1358 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp @@ -82,7 +82,7 @@ class boss_ayamiss : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _Reset(); _phase = PHASE_AIR; @@ -90,7 +90,7 @@ class boss_ayamiss : public CreatureScript SetCombatMovement(false); } - void JustSummoned(Creature* who) + void JustSummoned(Creature* who) OVERRIDE { switch (who->GetEntry()) { @@ -107,7 +107,7 @@ class boss_ayamiss : public CreatureScript } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type == POINT_MOTION_TYPE) { @@ -123,13 +123,13 @@ class boss_ayamiss : public CreatureScript } } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { me->ClearUnitState(UNIT_STATE_ROOT); BossAI::EnterEvadeMode(); } - void EnterCombat(Unit* attacker) + void EnterCombat(Unit* attacker) OVERRIDE { BossAI::EnterCombat(attacker); @@ -144,7 +144,7 @@ class boss_ayamiss : public CreatureScript me->GetMotionMaster()->MovePoint(POINT_AIR, AyamissAirPos); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -230,7 +230,7 @@ class boss_ayamiss : public CreatureScript bool _enraged; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_ayamissAI(creature); } @@ -248,7 +248,7 @@ class npc_hive_zara_larva : public CreatureScript _instance = me->GetInstanceScript(); } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type == POINT_MOTION_TYPE) if (id == POINT_PARALYZE) @@ -256,7 +256,8 @@ class npc_hive_zara_larva : public CreatureScript DoCast(target, SPELL_FEED); // Omnomnom } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (_instance->GetBossState(DATA_AYAMISS) == IN_PROGRESS) return; @@ -264,7 +265,7 @@ class npc_hive_zara_larva : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void AttackStart(Unit* victim) + void AttackStart(Unit* victim) OVERRIDE { if (_instance->GetBossState(DATA_AYAMISS) == IN_PROGRESS) return; @@ -272,7 +273,7 @@ class npc_hive_zara_larva : public CreatureScript ScriptedAI::AttackStart(victim); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (_instance->GetBossState(DATA_AYAMISS) == IN_PROGRESS) return; @@ -283,7 +284,7 @@ class npc_hive_zara_larva : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_hive_zara_larvaAI(creature); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp index de6924680ef..a0a093246b6 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp @@ -71,7 +71,7 @@ class boss_buru : public CreatureScript { } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { BossAI::EnterEvadeMode(); @@ -82,7 +82,7 @@ class boss_buru : public CreatureScript Eggs.clear(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { _EnterCombat(); Talk(EMOTE_TARGET, who->GetGUID()); @@ -95,14 +95,14 @@ class boss_buru : public CreatureScript _phase = PHASE_EGG; } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_EXPLODE) if (_phase == PHASE_EGG) me->DealDamage(me, 45000); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) ChaseNewVictim(); @@ -133,7 +133,7 @@ class boss_buru : public CreatureScript events.ScheduleEvent(EVENT_RESPAWN_EGG, 100000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -186,7 +186,7 @@ class boss_buru : public CreatureScript std::list<uint64> Eggs; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_buruAI(creature); } @@ -205,14 +205,14 @@ class npc_buru_egg : public CreatureScript SetCombatMovement(false); } - void EnterCombat(Unit* attacker) + void EnterCombat(Unit* attacker) OVERRIDE { if (Creature* buru = me->GetMap()->GetCreature(_instance->GetData64(DATA_BURU))) if (!buru->IsInCombat()) buru->AI()->AttackStart(attacker); } - void JustSummoned(Creature* who) + void JustSummoned(Creature* who) OVERRIDE { if (who->GetEntry() == NPC_HATCHLING) if (Creature* buru = me->GetMap()->GetCreature(_instance->GetData64(DATA_BURU))) @@ -220,7 +220,7 @@ class npc_buru_egg : public CreatureScript who->AI()->AttackStart(target); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { DoCastAOE(SPELL_EXPLODE, true); DoCastAOE(SPELL_EXPLODE_2, true); // Unknown purpose @@ -234,7 +234,7 @@ class npc_buru_egg : public CreatureScript InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_buru_eggAI(creature); } @@ -261,14 +261,14 @@ class spell_egg_explosion : public SpellScriptLoader GetCaster()->DealDamage(target, -16 * GetCaster()->GetDistance(target) + 500); } - void Register() + void Register() OVERRIDE { AfterCast += SpellCastFn(spell_egg_explosion_SpellScript::HandleAfterCast); OnEffectHitTarget += SpellEffectFn(spell_egg_explosion_SpellScript::HandleDummyHitTarget, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_egg_explosion_SpellScript(); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp index 043cba277c9..735ecb0c595 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp @@ -55,7 +55,7 @@ class boss_kurinnaxx : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _Reset(); _enraged = false; @@ -65,7 +65,7 @@ class boss_kurinnaxx : public CreatureScript events.ScheduleEvent(EVENT_WIDE_SLASH, 11000); } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE { if (!_enraged && HealthBelowPct(30)) { @@ -74,14 +74,14 @@ class boss_kurinnaxx : public CreatureScript } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); if (Creature* Ossirian = me->GetMap()->GetCreature(instance->GetData64(DATA_OSSIRIAN))) sCreatureTextMgr->SendChat(Ossirian, SAY_KURINAXX_DEATH, 0, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_ZONE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -125,7 +125,7 @@ class boss_kurinnaxx : public CreatureScript bool _enraged; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_kurinnaxxAI (creature); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp index dd52872e1da..6a1891e5c62 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp @@ -62,7 +62,7 @@ class boss_moam : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _Reset(); me->SetPower(POWER_MANA, 0); @@ -71,7 +71,7 @@ class boss_moam : public CreatureScript //events.ScheduleEvent(EVENT_WIDE_SLASH, 11000); } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE { if (!_isStonePhase && HealthBelowPct(45)) { @@ -80,7 +80,7 @@ class boss_moam : public CreatureScript } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -105,7 +105,7 @@ class boss_moam : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -175,7 +175,7 @@ class boss_moam : public CreatureScript bool _isStonePhase; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_moamAI(creature); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp index bd5f76c0c85..c19f16e0839 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp @@ -96,7 +96,7 @@ class boss_ossirian : public CreatureScript uint8 CrystalIterator; bool SaidIntro; - void Reset() + void Reset() OVERRIDE { _Reset(); CrystalIterator = 0; @@ -104,7 +104,7 @@ class boss_ossirian : public CreatureScript CrystalGUID = 0; } - void SpellHit(Unit* caster, SpellInfo const* spell) + void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE { for (uint8 i = 0; i < NUM_WEAKNESS; ++i) { @@ -117,7 +117,7 @@ class boss_ossirian : public CreatureScript } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_TRIGGER_WEAKNESS) if (Creature* Trigger = me->GetMap()->GetCreature(TriggerGUID)) @@ -125,7 +125,7 @@ class boss_ossirian : public CreatureScript Trigger->CastSpell(Trigger, SpellWeakness[urand(0, 4)], false); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.Reset(); @@ -158,19 +158,19 @@ class boss_ossirian : public CreatureScript } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { Cleanup(); summons.DespawnAll(); BossAI::EnterEvadeMode(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Cleanup(); _JustDied(); @@ -202,7 +202,8 @@ class boss_ossirian : public CreatureScript } } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!SaidIntro) { @@ -212,7 +213,7 @@ class boss_ossirian : public CreatureScript BossAI::MoveInLineOfSight(who); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -270,7 +271,7 @@ class boss_ossirian : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_ossirianAI (creature); } @@ -281,7 +282,7 @@ class go_ossirian_crystal : public GameObjectScript public: go_ossirian_crystal() : GameObjectScript("go_ossirian_crystal") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) + bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE { InstanceScript* Instance = player->GetInstanceScript(); if (!Instance) diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp index a7151ec7c05..87dbe3b0098 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp @@ -67,7 +67,7 @@ class boss_rajaxx : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _Reset(); enraged = false; @@ -75,18 +75,18 @@ class boss_rajaxx : public CreatureScript events.ScheduleEvent(EVENT_THUNDERCRASH, 12000); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { //SAY_DEATH _JustDied(); } - void EnterCombat(Unit* /*victim*/) + void EnterCombat(Unit* /*victim*/) OVERRIDE { _EnterCombat(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -119,7 +119,7 @@ class boss_rajaxx : public CreatureScript bool enraged; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_rajaxxAI (creature); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp index 658528f1fb4..87e0afeb8cc 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp @@ -72,13 +72,13 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript return true; } - void SetData64(uint32 type, uint64 data) + void SetData64(uint32 type, uint64 data) OVERRIDE { if (type == DATA_PARALYZED) _paralyzedGUID = data; } - uint64 GetData64(uint32 type) const + uint64 GetData64(uint32 type) const OVERRIDE { switch (type) { @@ -154,7 +154,7 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript uint64 _paralyzedGUID; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_ruins_of_ahnqiraj_InstanceMapScript(map); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index 413214e4366..fcc6317b15e 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -46,7 +46,7 @@ class boss_kri : public CreatureScript public: boss_kri() : CreatureScript("boss_kri") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_kriAI (creature); } @@ -67,7 +67,7 @@ public: bool VemDead; bool Death; - void Reset() + void Reset() OVERRIDE { Cleave_Timer = urand(4000, 8000); ToxicVolley_Timer = urand(6000, 12000); @@ -77,11 +77,11 @@ public: Death = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -92,7 +92,7 @@ public: instance->SetData(DATA_BUG_TRIO_DEATH, 1); } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -143,7 +143,7 @@ class boss_vem : public CreatureScript public: boss_vem() : CreatureScript("boss_vem") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_vemAI (creature); } @@ -163,7 +163,7 @@ public: bool Enraged; - void Reset() + void Reset() OVERRIDE { Charge_Timer = urand(15000, 27000); KnockBack_Timer = urand(8000, 20000); @@ -172,7 +172,7 @@ public: Enraged = false; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -184,11 +184,11 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -236,7 +236,7 @@ class boss_yauj : public CreatureScript public: boss_yauj() : CreatureScript("boss_yauj") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_yaujAI (creature); } @@ -256,7 +256,7 @@ public: bool VemDead; - void Reset() + void Reset() OVERRIDE { Heal_Timer = urand(25000, 40000); Fear_Timer = urand(12000, 24000); @@ -265,7 +265,7 @@ public: VemDead = false; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -285,11 +285,11 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index eaea49327f1..1e9e318f3a9 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -151,7 +151,7 @@ class boss_eye_of_cthun : public CreatureScript public: boss_eye_of_cthun() : CreatureScript("boss_eye_of_cthun") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new eye_of_cthunAI (creature); } @@ -183,7 +183,7 @@ public: float DarkGlareAngle; bool ClockWise; - void Reset() + void Reset() OVERRIDE { //Phase information PhaseTimer = 50000; //First dark glare in 50 seconds @@ -215,7 +215,7 @@ public: pPortal->SetReactState(REACT_PASSIVE); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); if (instance) @@ -230,7 +230,7 @@ public: Spawned->AI()->AttackStart(target); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Check if we have a target if (!UpdateVictim()) @@ -402,7 +402,7 @@ public: } } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { //No instance if (!instance) @@ -457,7 +457,7 @@ class boss_cthun : public CreatureScript public: boss_cthun() : CreatureScript("boss_cthun") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new cthunAI (creature); } @@ -499,7 +499,7 @@ public: //Stomach map, bool = true then in stomach UNORDERED_MAP<uint64, bool> Stomach_Map; - void Reset() + void Reset() OVERRIDE { //One random wisper every 90 - 300 seconds WisperTimer = 90000; @@ -532,7 +532,7 @@ public: instance->SetData(DATA_CTHUN_PHASE, PHASE_NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); } @@ -581,7 +581,7 @@ public: return (*j); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Check if we have a target if (!UpdateVictim()) @@ -859,13 +859,13 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_CTHUN_PHASE, PHASE_CTHUN_DONE); } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { //No instance if (!instance) @@ -895,7 +895,7 @@ public: } } - void DoAction(int32 param) + void DoAction(int32 param) OVERRIDE { switch (param) { @@ -913,7 +913,7 @@ class npc_eye_tentacle : public CreatureScript public: npc_eye_tentacle() : CreatureScript("npc_eye_tentacle") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new eye_tentacleAI (creature); } @@ -935,13 +935,13 @@ public: uint32 KillSelfTimer; uint64 Portal; - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Unit* p = Unit::GetUnit(*me, Portal)) p->Kill(p); } - void Reset() + void Reset() OVERRIDE { //Mind flay half a second after we spawn MindflayTimer = 500; @@ -950,12 +950,12 @@ public: KillSelfTimer = 35000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Check if we have a target if (!UpdateVictim()) @@ -988,7 +988,7 @@ class npc_claw_tentacle : public CreatureScript public: npc_claw_tentacle() : CreatureScript("npc_claw_tentacle") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new claw_tentacleAI (creature); } @@ -1011,13 +1011,13 @@ public: uint32 EvadeTimer; uint64 Portal; - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Unit* p = Unit::GetUnit(*me, Portal)) p->Kill(p); } - void Reset() + void Reset() OVERRIDE { //First rupture should happen half a second after we spawn GroundRuptureTimer = 500; @@ -1025,12 +1025,12 @@ public: EvadeTimer = 5000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Check if we have a target if (!UpdateVictim()) @@ -1098,7 +1098,7 @@ class npc_giant_claw_tentacle : public CreatureScript public: npc_giant_claw_tentacle() : CreatureScript("npc_giant_claw_tentacle") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new giant_claw_tentacleAI (creature); } @@ -1122,13 +1122,13 @@ public: uint32 EvadeTimer; uint64 Portal; - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Unit* p = Unit::GetUnit(*me, Portal)) p->Kill(p); } - void Reset() + void Reset() OVERRIDE { //First rupture should happen half a second after we spawn GroundRuptureTimer = 500; @@ -1137,12 +1137,12 @@ public: EvadeTimer = 5000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Check if we have a target if (!UpdateVictim()) @@ -1217,7 +1217,7 @@ class npc_giant_eye_tentacle : public CreatureScript public: npc_giant_eye_tentacle() : CreatureScript("npc_giant_eye_tentacle") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new giant_eye_tentacleAI (creature); } @@ -1238,24 +1238,24 @@ public: uint32 BeamTimer; uint64 Portal; - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Unit* p = Unit::GetUnit(*me, Portal)) p->Kill(p); } - void Reset() + void Reset() OVERRIDE { //Green Beam half a second after we spawn BeamTimer = 500; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Check if we have a target if (!UpdateVictim()) @@ -1281,7 +1281,7 @@ class npc_giant_flesh_tentacle : public CreatureScript public: npc_giant_flesh_tentacle() : CreatureScript("npc_giant_flesh_tentacle") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new flesh_tentacleAI (creature); } @@ -1293,7 +1293,7 @@ public: SetCombatMovement(false); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (TempSummon* summon = me->ToTempSummon()) if (Unit* summoner = summon->GetSummoner()) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp index c267dd1a8e0..4b4cb15edbf 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -46,7 +46,7 @@ class boss_fankriss : public CreatureScript public: boss_fankriss() : CreatureScript("boss_fankriss") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_fankrissAI (creature); } @@ -65,7 +65,7 @@ public: Creature* Hatchling; Creature* Spawn; - void Reset() + void Reset() OVERRIDE { MortalWound_Timer = urand(10000, 15000); SpawnHatchlings_Timer = urand(6000, 12000); @@ -96,11 +96,11 @@ public: Spawn->AI()->AttackStart(victim); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp index 5435de8c3ef..c74ce8ef68b 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp @@ -44,7 +44,7 @@ class boss_huhuran : public CreatureScript public: boss_huhuran() : CreatureScript("boss_huhuran") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_huhuranAI (creature); } @@ -63,7 +63,7 @@ public: bool Frenzy; bool Berserk; - void Reset() + void Reset() OVERRIDE { Frenzy_Timer = urand(25000, 35000); Wyvern_Timer = urand(18000, 28000); @@ -76,11 +76,11 @@ public: Berserk = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp index d1cc2025be4..f9b78c307c4 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp @@ -41,7 +41,7 @@ class boss_ouro : public CreatureScript public: boss_ouro() : CreatureScript("boss_ouro") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_ouroAI (creature); } @@ -60,7 +60,7 @@ public: bool Enrage; bool Submerged; - void Reset() + void Reset() OVERRIDE { Sweep_Timer = urand(5000, 10000); SandBlast_Timer = urand(20000, 35000); @@ -73,12 +73,12 @@ public: Submerged = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoCastVictim(SPELL_BIRTH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp index cadfbe1cd39..008dfac6a11 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp @@ -46,7 +46,7 @@ class boss_sartura : public CreatureScript public: boss_sartura() : CreatureScript("boss_sartura") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_sarturaAI (creature); } @@ -67,7 +67,7 @@ public: bool WhirlWind; bool AggroReset; - void Reset() + void Reset() OVERRIDE { WhirlWind_Timer = 30000; WhirlWindRandom_Timer = urand(3000, 7000); @@ -83,22 +83,22 @@ public: } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); } - 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()) @@ -189,7 +189,7 @@ class npc_sartura_royal_guard : public CreatureScript public: npc_sartura_royal_guard() : CreatureScript("npc_sartura_royal_guard") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_sartura_royal_guardAI (creature); } @@ -208,7 +208,7 @@ public: bool WhirlWind; bool AggroReset; - void Reset() + void Reset() OVERRIDE { WhirlWind_Timer = 30000; WhirlWindRandom_Timer = urand(3000, 7000); @@ -221,11 +221,11 @@ public: AggroReset = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index 9fb241b961b..1921cd77ce6 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -57,26 +57,26 @@ class boss_skeram : public CreatureScript { boss_skeramAI(Creature* creature) : BossAI(creature, DATA_SKERAM) { } - void Reset() + void Reset() OVERRIDE { _flag = 0; _hpct = 75.0f; me->SetVisible(true); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { ScriptedAI::EnterEvadeMode(); if (me->IsSummon()) ((TempSummon*)me)->UnSummon(); } - void JustSummoned(Creature* creature) + void JustSummoned(Creature* creature) OVERRIDE { // Shift the boss and images (Get it? *Shift*?) uint8 rand = 0; @@ -113,7 +113,7 @@ class boss_skeram : public CreatureScript creature->SetHealth(creature->GetMaxHealth() * (me->GetHealthPct() / 100.0f)); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (!me->IsSummon()) Talk(SAY_DEATH); @@ -121,7 +121,7 @@ class boss_skeram : public CreatureScript me->RemoveCorpse(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.Reset(); @@ -134,7 +134,7 @@ class boss_skeram : public CreatureScript Talk(SAY_AGGRO); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -189,7 +189,7 @@ class boss_skeram : public CreatureScript uint8 _flag; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_skeramAI(creature); } @@ -222,13 +222,13 @@ class spell_skeram_arcane_explosion : public SpellScriptLoader targets.remove_if(PlayerOrPetCheck()); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_skeram_arcane_explosion_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_skeram_arcane_explosion_SpellScript(); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index 833ba83432b..c20a8b29418 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -109,7 +109,7 @@ struct boss_twinemperorsAI : public ScriptedAI return NULL; } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { Unit* pOtherBoss = GetOtherBoss(); if (pOtherBoss) @@ -126,7 +126,7 @@ struct boss_twinemperorsAI : public ScriptedAI } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Creature* pOtherBoss = GetOtherBoss(); if (pOtherBoss) @@ -140,12 +140,12 @@ struct boss_twinemperorsAI : public ScriptedAI DoPlaySoundToSet(me, IAmVeklor() ? SOUND_VL_DEATH : SOUND_VN_DEATH); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { DoPlaySoundToSet(me, IAmVeklor() ? SOUND_VL_KILL : SOUND_VN_KILL); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { DoZoneInCombat(); Creature* pOtherBoss = GetOtherBoss(); @@ -163,7 +163,7 @@ struct boss_twinemperorsAI : public ScriptedAI } } - void SpellHit(Unit* caster, const SpellInfo* entry) + void SpellHit(Unit* caster, const SpellInfo* entry) OVERRIDE { if (caster == me) return; @@ -292,7 +292,8 @@ struct boss_twinemperorsAI : public ScriptedAI } } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!who || me->GetVictim()) return; @@ -391,7 +392,7 @@ class boss_veknilash : public CreatureScript public: boss_veknilash() : CreatureScript("boss_veknilash") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_veknilashAI (creature); } @@ -410,7 +411,7 @@ public: Creature* Summoned; - void Reset() + void Reset() OVERRIDE { TwinReset(); UpperCut_Timer = urand(14000, 29000); @@ -429,7 +430,7 @@ public: target->SetFullHealth(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -477,7 +478,7 @@ class boss_veklor : public CreatureScript public: boss_veklor() : CreatureScript("boss_veklor") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_veklorAI (creature); } @@ -497,7 +498,7 @@ public: Creature* Summoned; - void Reset() + void Reset() OVERRIDE { TwinReset(); ShadowBolt_Timer = 0; @@ -518,7 +519,7 @@ public: target->SetFullHealth(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -579,7 +580,7 @@ public: //DoMeleeAttackIfReady(); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who) return; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp index 9f9f159ee9e..115d9d0d12c 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp @@ -93,14 +93,14 @@ class boss_viscidus : public CreatureScript { boss_viscidusAI(Creature* creature) : BossAI(creature, DATA_VISCIDUS) { } - void Reset() + void Reset() OVERRIDE { _Reset(); _hitcounter = 0; _phase = PHASE_FROST; } - void DamageTaken(Unit* attacker, uint32& /*damage*/) + void DamageTaken(Unit* attacker, uint32& /*damage*/) OVERRIDE { if (_phase != PHASE_MELEE) return; @@ -139,7 +139,7 @@ class boss_viscidus : public CreatureScript Talk(EMOTE_CRACK); } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { if ((spell->GetSchoolMask() & SPELL_SCHOOL_MASK_FROST) && _phase == PHASE_FROST && me->GetHealthPct() > 5.0f) { @@ -168,7 +168,7 @@ class boss_viscidus : public CreatureScript } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.Reset(); @@ -182,19 +182,19 @@ class boss_viscidus : public CreatureScript events.ScheduleEvent(EVENT_POISON_SHOCK, urand(7000, 12000)); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { summons.DespawnAll(); ScriptedAI::EnterEvadeMode(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { DoCast(me, SPELL_VISCIDUS_SUICIDE); summons.DespawnAll(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -245,7 +245,7 @@ class boss_viscidus : public CreatureScript Phases _phase; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_viscidusAI(creature); } @@ -260,7 +260,7 @@ class npc_glob_of_viscidus : public CreatureScript { npc_glob_of_viscidusAI(Creature* creature) : ScriptedAI(creature) { } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { InstanceScript* Instance = me->GetInstanceScript(); if (!Instance) @@ -284,7 +284,7 @@ class npc_glob_of_viscidus : public CreatureScript } } - void MovementInform(uint32 /*type*/, uint32 id) + void MovementInform(uint32 /*type*/, uint32 id) OVERRIDE { if (id == ROOM_CENTER) { @@ -294,7 +294,7 @@ class npc_glob_of_viscidus : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_glob_of_viscidusAI(creature); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp index 894849c5835..29b38befe29 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp @@ -32,7 +32,7 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript public: instance_temple_of_ahnqiraj() : InstanceMapScript("instance_temple_of_ahnqiraj", 531) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_temple_of_ahnqiraj_InstanceMapScript(map); } @@ -105,7 +105,7 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript return false; } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -133,7 +133,7 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript return 0; } - uint64 GetData64(uint32 identifier) const + uint64 GetData64(uint32 identifier) const OVERRIDE { switch (identifier) { @@ -153,7 +153,7 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript return 0; } // end GetData64 - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index 6161f8bf552..77c72924069 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -64,7 +64,7 @@ class npc_anubisath_sentinel : public CreatureScript public: npc_anubisath_sentinel() : CreatureScript("npc_anubisath_sentinel") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new aqsentinelAI (creature); } @@ -213,7 +213,7 @@ public: bool gatherOthersWhenAggro; - void Reset() + void Reset() OVERRIDE { if (!me->isDead()) { @@ -237,7 +237,7 @@ public: me->AddAura(id, me); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (gatherOthersWhenAggro) GetOtherSentinels(who); @@ -246,7 +246,7 @@ public: DoZoneInCombat(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { for (int ni=0; ni<3; ++ni) { diff --git a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp index e09a7611f21..c477a82d085 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp @@ -34,7 +34,7 @@ class instance_wailing_caverns : public InstanceMapScript public: instance_wailing_caverns() : InstanceMapScript("instance_wailing_caverns", 43) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_wailing_caverns_InstanceMapScript(map); } @@ -62,7 +62,7 @@ public: NaralexGUID = creature->GetGUID(); } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -80,7 +80,7 @@ public: if (data == DONE)SaveToDB(); } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -98,7 +98,7 @@ public: return 0; } - uint64 GetData64(uint32 data) const + uint64 GetData64(uint32 data) const OVERRIDE { if (data == DATA_NARALEX)return NaralexGUID; return 0; diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp index a4a5e0d94be..706c6e1804d 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp @@ -79,12 +79,12 @@ class npc_disciple_of_naralex : public CreatureScript public: npc_disciple_of_naralex() : CreatureScript("npc_disciple_of_naralex") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_disciple_of_naralexAI(creature); } - 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(); @@ -106,7 +106,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { InstanceScript* instance = creature->GetInstanceScript(); @@ -150,7 +150,7 @@ public: uint32 eventProgress; InstanceScript* instance; - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (!instance) return; @@ -182,17 +182,17 @@ public: } } - void Reset() + void Reset() OVERRIDE { } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { Talk(SAY_ATTACKED, who->GetGUID()); } - void JustDied(Unit* /*slayer*/) + void JustDied(Unit* /*slayer*/) OVERRIDE { if (instance) { @@ -203,12 +203,12 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (currentEvent != TYPE_NARALEX_PART3) npc_escortAI::UpdateAI(diff); diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index 83a6cf4a17a..de27368a227 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -101,7 +101,7 @@ class instance_zulfarrak : public InstanceMapScript public: instance_zulfarrak() : InstanceMapScript("instance_zulfarrak", 209) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_zulfarrak_InstanceMapScript(map); } @@ -187,7 +187,7 @@ public: } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -197,7 +197,7 @@ public: return 0; } - uint64 GetData64(uint32 data) const + uint64 GetData64(uint32 data) const OVERRIDE { switch (data) { @@ -219,7 +219,7 @@ public: return 0; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index af76ea041a8..19d922de2bd 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -64,7 +64,7 @@ class npc_sergeant_bly : public CreatureScript public: npc_sergeant_bly() : CreatureScript("npc_sergeant_bly") { } - 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) @@ -76,7 +76,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (InstanceScript* instance = creature->GetInstanceScript()) { @@ -95,7 +95,7 @@ public: return false; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_sergeant_blyAI (creature); } @@ -116,7 +116,7 @@ public: uint32 Revenge_Timer; //this is wrong, spell should never be used unless me->GetVictim() dodge, parry or block attack. Trinity support required. uint64 PlayerGUID; - void Reset() + void Reset() OVERRIDE { ShieldBash_Timer = 5000; Revenge_Timer = 8000; @@ -124,7 +124,7 @@ public: me->setFaction(FACTION_FRIENDLY); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (postGossipStep>0 && postGossipStep<4) { @@ -182,7 +182,7 @@ public: DoMeleeAttackIfReady(); } - void DoAction(int32 /*param*/) + void DoAction(int32 /*param*/) OVERRIDE { postGossipStep=1; Text_Timer = 0; @@ -207,7 +207,7 @@ class go_troll_cage : public GameObjectScript public: go_troll_cage() : GameObjectScript("go_troll_cage") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE { if (InstanceScript* instance = go->GetInstanceScript()) { @@ -261,7 +261,7 @@ class npc_weegli_blastfuse : public CreatureScript public: npc_weegli_blastfuse() : CreatureScript("npc_weegli_blastfuse") { } - 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) @@ -273,7 +273,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (InstanceScript* instance = creature->GetInstanceScript()) { @@ -294,7 +294,7 @@ public: return false; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_weegli_blastfuseAI (creature); } @@ -314,24 +314,24 @@ public: bool destroyingDoor; InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { /*if (instance) instance->SetData(0, NOT_STARTED);*/ } - void AttackStart(Unit* victim) + void AttackStart(Unit* victim) OVERRIDE { AttackStartCaster(victim, 10);//keep back & toss bombs/shoot } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { /*if (instance) instance->SetData(0, DONE);*/ } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -356,7 +356,7 @@ public: } } - void MovementInform(uint32 /*type*/, uint32 /*id*/) + void MovementInform(uint32 /*type*/, uint32 /*id*/) OVERRIDE { if (instance) { @@ -376,7 +376,7 @@ public: } } - void DoAction(int32 /*param*/) + void DoAction(int32 /*param*/) OVERRIDE { DestroyDoor(); } @@ -413,7 +413,7 @@ class go_shallow_grave : public GameObjectScript public: go_shallow_grave() : GameObjectScript("go_shallow_grave") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE { // randomly summon a zombie or dead hero the first time a grave is used if (go->GetUseCount() == 0) @@ -445,7 +445,7 @@ class at_zumrah : public AreaTriggerScript public: at_zumrah() : AreaTriggerScript("at_zumrah") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) OVERRIDE { Creature* pZumrah = player->FindNearestCreature(ZUMRAH_ID, 30.0f); diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp index 4f70191810a..229a9035f7c 100644 --- a/src/server/scripts/Kalimdor/boss_azuregos.cpp +++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp @@ -47,7 +47,7 @@ class boss_azuregos : public CreatureScript public: boss_azuregos() : CreatureScript("boss_azuregos") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_azuregosAI (creature); } @@ -66,7 +66,7 @@ public: uint32 EnrageTimer; bool Enraged; - void Reset() + void Reset() OVERRIDE { MarkOfFrostTimer = 35000; ManaStormTimer = urand(5000, 17000); @@ -79,9 +79,9 @@ public: Enraged = false; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp index 315ee609bca..bd4c2f893c5 100644 --- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp +++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp @@ -78,7 +78,7 @@ class npc_torek : public CreatureScript uint32 Thunderclap_Timer; bool Completed; - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (Player* player = GetPlayerForEscort()) { @@ -108,23 +108,23 @@ class npc_torek : public CreatureScript } } - void Reset() + void Reset() OVERRIDE { Rend_Timer = 5000; Thunderclap_Timer = 8000; Completed = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { npc_escortAI::UpdateAI(diff); @@ -145,12 +145,12 @@ class npc_torek : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_torekAI(creature); } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_TOREK_ASSULT) { @@ -200,7 +200,7 @@ class npc_ruul_snowhoof : public CreatureScript { npc_ruul_snowhoofAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -229,31 +229,31 @@ class npc_ruul_snowhoof : public CreatureScript } } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void Reset() + void Reset() OVERRIDE { if (GameObject* Cage = me->FindNearestGameObject(GO_CAGE, 20)) Cage->SetGoState(GO_STATE_READY); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { npc_escortAI::UpdateAI(diff); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ruul_snowhoofAI(creature); } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_FREEDOM_TO_RUUL) { @@ -325,12 +325,12 @@ class npc_muglash : public CreatureScript uint32 EventTimer; bool IsBrazierExtinguished; - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (Player* player = GetPlayerForEscort()) { @@ -362,7 +362,7 @@ class npc_muglash : public CreatureScript } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (Player* player = GetPlayerForEscort()) if (HasEscortState(STATE_ESCORT_PAUSED)) @@ -373,14 +373,14 @@ class npc_muglash : public CreatureScript } } - void Reset() + void Reset() OVERRIDE { EventTimer = 10000; WaveId = 0; IsBrazierExtinguished = false; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (HasEscortState(STATE_ESCORT_ESCORTING)) if (Player* player = GetPlayerForEscort()) @@ -411,7 +411,7 @@ class npc_muglash : public CreatureScript } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { npc_escortAI::UpdateAI(uiDiff); @@ -434,12 +434,12 @@ class npc_muglash : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_muglashAI(creature); } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_VORSHA) { @@ -460,7 +460,7 @@ class go_naga_brazier : public GameObjectScript public: go_naga_brazier() : GameObjectScript("go_naga_brazier") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE { if (Creature* creature = GetClosestCreatureWithEntry(go, NPC_MUGLASH, INTERACTION_DISTANCE*2)) { diff --git a/src/server/scripts/Kalimdor/zone_azshara.cpp b/src/server/scripts/Kalimdor/zone_azshara.cpp index 1669337b6e9..8eb78cbf438 100644 --- a/src/server/scripts/Kalimdor/zone_azshara.cpp +++ b/src/server/scripts/Kalimdor/zone_azshara.cpp @@ -46,7 +46,7 @@ class npc_spitelashes : public CreatureScript public: npc_spitelashes() : CreatureScript("npc_spitelashes") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_spitelashesAI (creature); } @@ -58,15 +58,15 @@ public: uint32 morphtimer; bool spellhit; - void Reset() + void Reset() OVERRIDE { morphtimer = 0; spellhit = false; } - 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 (spellhit) return; @@ -89,7 +89,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { // we mustn't remove the Creature in the same round in which we cast the summon spell, otherwise there will be no summons if (spellhit && morphtimer >= 5000) @@ -134,7 +134,7 @@ class npc_loramus_thalipedes : public CreatureScript public: npc_loramus_thalipedes() : CreatureScript("npc_loramus_thalipedes") { } - 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) @@ -172,7 +172,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -281,7 +281,7 @@ class npc_rizzle_sprysprocket : public CreatureScript public: npc_rizzle_sprysprocket() : CreatureScript("npc_rizzle_sprysprocket") { } - 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 && player->GetQuestStatus(QUEST_CHASING_THE_MOONSTONE) == QUEST_STATUS_INCOMPLETE) @@ -294,7 +294,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(QUEST_CHASING_THE_MOONSTONE) != QUEST_STATUS_INCOMPLETE) return true; @@ -303,7 +303,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_rizzle_sprysprocketAI (creature); } @@ -326,7 +326,7 @@ public: bool ContinueWP; bool Reached; - void Reset() + void Reset() OVERRIDE { SpellEscapeTimer = 1300; TeleportTimer = 3500; @@ -343,7 +343,7 @@ public: Reached = false; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (MustDie) { @@ -436,7 +436,7 @@ public: sWorld->SendServerMessage(SERVER_MSG_STRING, text, player); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who || PlayerGUID) return; @@ -452,9 +452,9 @@ public: } } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -479,7 +479,7 @@ class npc_depth_charge : public CreatureScript public: npc_depth_charge() : CreatureScript("npc_depth_charge") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_depth_chargeAI (creature); } @@ -491,7 +491,7 @@ public: bool WeMustDie; uint32 WeMustDieTimer; - void Reset() + void Reset() OVERRIDE { me->SetHover(true); me->SetSwim(true); @@ -500,7 +500,7 @@ public: WeMustDieTimer = 1000; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (WeMustDie) { @@ -512,7 +512,8 @@ public: return; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!who) return; @@ -525,9 +526,9 @@ public: } } - void AttackStart(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) OVERRIDE {} - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} }; }; diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp index 9f2c39e9a27..f5902faa3ff 100644 --- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp @@ -61,7 +61,7 @@ class npc_draenei_survivor : public CreatureScript public: npc_draenei_survivor() : CreatureScript("npc_draenei_survivor") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_draenei_survivorAI (creature); } @@ -78,7 +78,7 @@ public: bool CanSayHelp; - void Reset() + void Reset() OVERRIDE { pCaster = 0; @@ -96,9 +96,10 @@ public: me->SetStandState(UNIT_STAND_STATE_SLEEP); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void MoveInLineOfSight(Unit* who) OVERRIDE - void MoveInLineOfSight(Unit* who) { if (CanSayHelp && who->GetTypeId() == TYPEID_PLAYER && me->IsFriendlyTo(who) && me->IsWithinDistInMap(who, 25.0f)) { @@ -110,7 +111,7 @@ public: } } - void SpellHit(Unit* Caster, const SpellInfo* Spell) + void SpellHit(Unit* Caster, const SpellInfo* Spell) OVERRIDE { if (Spell->SpellFamilyFlags[2] & 0x080000000) { @@ -125,7 +126,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (SayThanksTimer) { @@ -194,7 +195,7 @@ class npc_engineer_spark_overgrind : public CreatureScript public: npc_engineer_spark_overgrind() : CreatureScript("npc_engineer_spark_overgrind") { } - 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) @@ -206,7 +207,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(QUEST_GNOMERCY) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); @@ -215,7 +216,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_engineer_spark_overgrindAI (creature); } @@ -239,7 +240,7 @@ public: bool IsTreeEvent; - void Reset() + void Reset() OVERRIDE { DynamiteTimer = 8000; EmoteTimer = urand(120000, 150000); @@ -250,12 +251,12 @@ public: IsTreeEvent = false; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { Talk(ATTACK_YELL, who->GetGUID()); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!me->IsInCombat() && !IsTreeEvent) { @@ -293,7 +294,7 @@ class npc_injured_draenei : public CreatureScript public: npc_injured_draenei() : CreatureScript("npc_injured_draenei") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_injured_draeneiAI (creature); } @@ -302,7 +303,7 @@ public: { npc_injured_draeneiAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT); me->SetHealth(me->CountPctFromMaxHealth(15)); @@ -318,11 +319,12 @@ public: } } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(uint32 /*diff*/) {} + void UpdateAI(uint32 /*diff*/) OVERRIDE {} }; }; @@ -348,7 +350,7 @@ class npc_magwin : public CreatureScript public: npc_magwin() : CreatureScript("npc_magwin") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_A_CRY_FOR_SAY_HELP) { @@ -359,7 +361,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_magwinAI(creature); } @@ -368,7 +370,7 @@ public: { npc_magwinAI(Creature* creature) : npc_escortAI(creature) {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (Player* player = GetPlayerForEscort()) { @@ -392,12 +394,12 @@ public: } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { Talk(SAY_AGGRO, who->GetGUID()); } - void Reset() {} + void Reset() OVERRIDE {} }; }; @@ -433,7 +435,7 @@ class npc_geezle : public CreatureScript public: npc_geezle() : CreatureScript("npc_geezle") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_geezleAI(creature); } @@ -449,14 +451,14 @@ public: bool EventStarted; - void Reset() + void Reset() OVERRIDE { SparkGUID = 0; Step = 0; StartEvent(); } - void EnterCombat(Unit* /*who*/){} + void EnterCombat(Unit* /*who*/)OVERRIDE {} void StartEvent() { @@ -556,7 +558,7 @@ public: TC_LOG_ERROR(LOG_FILTER_TSCR, "SD2 ERROR: FlagList is empty!"); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (SayTimer <= diff) { @@ -585,7 +587,7 @@ class go_ravager_cage : public GameObjectScript public: go_ravager_cage() : GameObjectScript("go_ravager_cage") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { go->UseDoorOrButton(); if (player->GetQuestStatus(QUEST_STRENGTH_ONE) == QUEST_STATUS_INCOMPLETE) @@ -606,7 +608,7 @@ class npc_death_ravager : public CreatureScript public: npc_death_ravager() : CreatureScript("npc_death_ravager") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_death_ravagerAI(creature); } @@ -618,7 +620,7 @@ public: uint32 RendTimer; uint32 EnragingBiteTimer; - void Reset() + void Reset() OVERRIDE { RendTimer = 30000; EnragingBiteTimer = 20000; @@ -627,7 +629,7 @@ public: me->SetReactState(REACT_PASSIVE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -677,7 +679,7 @@ class npc_stillpine_capitive : public CreatureScript { npc_stillpine_capitiveAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { if (GameObject* cage = me->FindNearestGameObject(GO_BRISTELIMB_CAGE, 5.0f)) { @@ -701,7 +703,7 @@ class npc_stillpine_capitive : public CreatureScript me->GetMotionMaster()->MovePoint(POINT_INIT, pos); } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE || id != POINT_INIT) return; @@ -713,7 +715,7 @@ class npc_stillpine_capitive : public CreatureScript _events.ScheduleEvent(EVENT_DESPAWN, 3500); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!_movementComplete) return; @@ -730,7 +732,7 @@ class npc_stillpine_capitive : public CreatureScript bool _movementComplete; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_stillpine_capitiveAI(creature); } @@ -741,7 +743,7 @@ class go_bristlelimb_cage : public GameObjectScript public: go_bristlelimb_cage() : GameObjectScript("go_bristlelimb_cage") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { go->SetGoState(GO_STATE_READY); if (player->GetQuestStatus(QUEST_THE_PROPHECY_OF_AKIDA) == QUEST_STATUS_INCOMPLETE) diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp index 713c66b66b8..d9989c5035c 100644 --- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp @@ -45,7 +45,7 @@ class npc_webbed_creature : public CreatureScript public: npc_webbed_creature() : CreatureScript("npc_webbed_creature") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_webbed_creatureAI (creature); } @@ -54,11 +54,11 @@ public: { npc_webbed_creatureAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() {} + void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { uint32 spawnCreatureID = 0; @@ -100,7 +100,7 @@ class npc_captured_sunhawk_agent : public CreatureScript public: npc_captured_sunhawk_agent() : CreatureScript("npc_captured_sunhawk_agent") { } - 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) @@ -133,7 +133,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->HasAura(31609) && player->GetQuestStatus(9756) == QUEST_STATUS_INCOMPLETE) { @@ -166,7 +166,7 @@ class go_princess_stillpines_cage : public GameObjectScript public: go_princess_stillpines_cage() : GameObjectScript("go_princess_stillpines_cage") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { go->SetGoState(GO_STATE_READY); if (Creature* stillpine = go->FindNearestCreature(NPC_PRINCESS_STILLPINE, 25, true)) @@ -187,7 +187,7 @@ public: { npc_princess_stillpineAI(Creature* creature) : ScriptedAI(creature) {} - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type == POINT_MOTION_TYPE && id == 1) { @@ -197,7 +197,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_princess_stillpineAI(creature); } diff --git a/src/server/scripts/Kalimdor/zone_darkshore.cpp b/src/server/scripts/Kalimdor/zone_darkshore.cpp index 1e1cffc93b7..5350693471b 100644 --- a/src/server/scripts/Kalimdor/zone_darkshore.cpp +++ b/src/server/scripts/Kalimdor/zone_darkshore.cpp @@ -63,7 +63,7 @@ class npc_kerlonian : public CreatureScript public: npc_kerlonian() : CreatureScript("npc_kerlonian") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_SLEEPER_AWAKENED) { @@ -78,7 +78,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_kerlonianAI(creature); } @@ -89,12 +89,13 @@ public: uint32 FallAsleepTimer; - void Reset() + void Reset() OVERRIDE { FallAsleepTimer = urand(10000, 45000); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { FollowerAI::MoveInLineOfSight(who); @@ -115,7 +116,7 @@ public: } } - void SpellHit(Unit* /*pCaster*/, const SpellInfo* pSpell) + void SpellHit(Unit* /*pCaster*/, const SpellInfo* pSpell) OVERRIDE { if (HasFollowState(STATE_FOLLOW_INPROGRESS | STATE_FOLLOW_PAUSED) && pSpell->Id == SPELL_AWAKEN) ClearSleeping(); @@ -143,7 +144,7 @@ public: SetFollowPaused(false); } - void UpdateFollowerAI(uint32 Diff) + void UpdateFollowerAI(uint32 Diff) OVERRIDE { if (!UpdateVictim()) { @@ -202,7 +203,7 @@ class npc_prospector_remtravel : public CreatureScript public: npc_prospector_remtravel() : CreatureScript("npc_prospector_remtravel") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_ABSENT_MINDED_PT2) { @@ -215,7 +216,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_prospector_remtravelAI(creature); } @@ -224,7 +225,7 @@ public: { npc_prospector_remtravelAI(Creature* creature) : npc_escortAI(creature) {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (Player* player = GetPlayerForEscort()) { @@ -285,15 +286,15 @@ public: } } - void Reset() {} + void Reset() OVERRIDE {} - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (urand(0, 1)) Talk(SAY_REM_AGGRO, who->GetGUID()); } - void JustSummoned(Creature* /*pSummoned*/) + void JustSummoned(Creature* /*pSummoned*/) OVERRIDE { //unsure if it should be any //pSummoned->AI()->AttackStart(me); @@ -322,7 +323,7 @@ class npc_threshwackonator : public CreatureScript public: npc_threshwackonator() : CreatureScript("npc_threshwackonator") { } - 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) @@ -339,7 +340,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(QUEST_GYROMAST_REV) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_INSERT_KEY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -348,7 +349,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_threshwackonatorAI(creature); } @@ -357,9 +358,10 @@ public: { npc_threshwackonatorAI(Creature* creature) : FollowerAI(creature) { } - void Reset() { } + void Reset() OVERRIDE {} + + void MoveInLineOfSight(Unit* who) OVERRIDE - void MoveInLineOfSight(Unit* who) { FollowerAI::MoveInLineOfSight(who); diff --git a/src/server/scripts/Kalimdor/zone_desolace.cpp b/src/server/scripts/Kalimdor/zone_desolace.cpp index b21cb28e0d5..882bc176932 100644 --- a/src/server/scripts/Kalimdor/zone_desolace.cpp +++ b/src/server/scripts/Kalimdor/zone_desolace.cpp @@ -61,7 +61,7 @@ class npc_aged_dying_ancient_kodo : public CreatureScript public: npc_aged_dying_ancient_kodo() : CreatureScript("npc_aged_dying_ancient_kodo") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->HasAura(SPELL_KODO_KOMBO_PLAYER_BUFF) && creature->HasAura(SPELL_KODO_KOMBO_DESPAWN_BUFF)) { @@ -77,7 +77,8 @@ public: { npc_aged_dying_ancient_kodoAI(Creature* creature) : ScriptedAI(creature) {} - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (who->GetEntry() == NPC_SMEED && me->IsWithinDistInMap(who, 10.0f) && !me->HasAura(SPELL_KODO_KOMBO_GOSSIP)) { @@ -88,7 +89,7 @@ public: } } - void SpellHit(Unit* caster, SpellInfo const* spell) + void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_KODO_KOMBO_ITEM) { @@ -110,7 +111,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_aged_dying_ancient_kodoAI(creature); } @@ -133,7 +134,7 @@ class go_iruxos : public GameObjectScript public: go_iruxos() : GameObjectScript("go_iruxos") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (player->GetQuestStatus(QUEST_HAND_IRUXOS) == QUEST_STATUS_INCOMPLETE && !go->FindNearestCreature(NPC_DEMON_SPIRIT, 25.0f, true)) player->SummonCreature(NPC_DEMON_SPIRIT, go->GetPositionX(), go->GetPositionY(), go->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); @@ -156,7 +157,7 @@ class npc_dalinda : public CreatureScript public: npc_dalinda() : CreatureScript("npc_dalinda") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_RETURN_TO_VAHLARRIEL) { @@ -169,7 +170,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_dalindaAI(creature); } @@ -178,7 +179,7 @@ public: { npc_dalindaAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); @@ -194,18 +195,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 { if (Player* player = GetPlayerForEscort()) player->FailQuest(QUEST_RETURN_TO_VAHLARRIEL); return; } - void UpdateAI(uint32 Diff) + void UpdateAI(uint32 Diff) OVERRIDE { npc_escortAI::UpdateAI(Diff); if (!UpdateVictim()) @@ -231,7 +232,7 @@ class go_demon_portal : public GameObjectScript public: go_demon_portal() : GameObjectScript("go_demon_portal") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (player->GetQuestStatus(QUEST_PORTAL_OF_THE_LEGION) == QUEST_STATUS_INCOMPLETE && !go->FindNearestCreature(NPC_DEMON_GUARDIAN, 5.0f, true)) { diff --git a/src/server/scripts/Kalimdor/zone_durotar.cpp b/src/server/scripts/Kalimdor/zone_durotar.cpp index 31b710f61a5..63309c0502d 100644 --- a/src/server/scripts/Kalimdor/zone_durotar.cpp +++ b/src/server/scripts/Kalimdor/zone_durotar.cpp @@ -44,7 +44,7 @@ class npc_lazy_peon : public CreatureScript public: npc_lazy_peon() : CreatureScript("npc_lazy_peon") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_lazy_peonAI(creature); } @@ -58,20 +58,20 @@ public: uint32 RebuffTimer; bool work; - void Reset() + void Reset() OVERRIDE { PlayerGUID = 0; RebuffTimer = 0; work = false; } - void MovementInform(uint32 /*type*/, uint32 id) + void MovementInform(uint32 /*type*/, uint32 id) OVERRIDE { if (id == 1) work = true; } - void SpellHit(Unit* caster, const SpellInfo* spell) + void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE { if (spell->Id != SPELL_AWAKEN_PEON) return; @@ -87,7 +87,7 @@ public: } } - void UpdateAI(uint32 Diff) + void UpdateAI(uint32 Diff) OVERRIDE { if (work == true) me->HandleEmoteCommand(EMOTE_ONESHOT_WORK_CHOPWOOD); @@ -186,7 +186,7 @@ class npc_tiger_matriarch_credit : public CreatureScript events.ScheduleEvent(EVENT_CHECK_SUMMON_AURA, 2000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { events.Update(diff); @@ -221,7 +221,7 @@ class npc_tiger_matriarch_credit : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_tiger_matriarch_creditAI(creature); } @@ -239,14 +239,14 @@ class npc_tiger_matriarch : public CreatureScript { } - void EnterCombat(Unit* /*target*/) + void EnterCombat(Unit* /*target*/) OVERRIDE { _events.Reset(); _events.ScheduleEvent(EVENT_POUNCE, 100); _events.ScheduleEvent(EVENT_NOSUMMON, 50000); } - void IsSummonedBy(Unit* summoner) + void IsSummonedBy(Unit* summoner) OVERRIDE { if (summoner->GetTypeId() != TYPEID_PLAYER || !summoner->GetVehicle()) return; @@ -259,7 +259,7 @@ class npc_tiger_matriarch : public CreatureScript } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_UNIT || !victim->IsSummon()) return; @@ -274,7 +274,7 @@ class npc_tiger_matriarch : public CreatureScript me->DespawnOrUnsummon(); } - void DamageTaken(Unit* attacker, uint32& damage) + void DamageTaken(Unit* attacker, uint32& damage) OVERRIDE { if (!attacker->IsSummon()) return; @@ -298,7 +298,7 @@ class npc_tiger_matriarch : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -338,7 +338,7 @@ class npc_tiger_matriarch : public CreatureScript uint64 _tigerGuid; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_tiger_matriarchAI(creature); } @@ -362,7 +362,7 @@ class npc_troll_volunteer : public CreatureScript { } - void InitializeAI() + void InitializeAI() OVERRIDE { if (me->isDead() || !me->GetOwner()) return; @@ -389,7 +389,7 @@ class npc_troll_volunteer : public CreatureScript me->GetMotionMaster()->MoveFollow(player, 5.0f, float(rand_norm() + 1.0f) * M_PI / 3.0f * 4.0f); } - void Reset() + void Reset() OVERRIDE { _complete = false; me->AddAura(SPELL_VOLUNTEER_AURA, me); @@ -405,7 +405,7 @@ class npc_troll_volunteer : public CreatureScript return _mountModel; } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -413,7 +413,7 @@ class npc_troll_volunteer : public CreatureScript me->DespawnOrUnsummon(); } - void SpellHit(Unit* caster, SpellInfo const* spell) + void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_AOE_TURNIN && caster->GetEntry() == NPC_URUZIN && !_complete) { @@ -432,7 +432,7 @@ class npc_troll_volunteer : public CreatureScript bool _complete; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_troll_volunteerAI(creature); } @@ -448,7 +448,7 @@ class spell_mount_check : public SpellScriptLoader class spell_mount_check_AuraScript : public AuraScript { PrepareAuraScript(spell_mount_check_AuraScript) - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MOUNTING_CHECK)) return false; @@ -475,13 +475,13 @@ class spell_mount_check : public SpellScriptLoader target->SetSpeed(MOVE_WALK, owner->GetSpeedRate(MOVE_WALK)); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_mount_check_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mount_check_AuraScript(); } @@ -495,7 +495,7 @@ class spell_voljin_war_drums : public SpellScriptLoader class spell_voljin_war_drums_SpellScript : public SpellScript { PrepareSpellScript(spell_voljin_war_drums_SpellScript) - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MOTIVATE_1)) return false; @@ -519,13 +519,13 @@ class spell_voljin_war_drums : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_voljin_war_drums_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_voljin_war_drums_SpellScript(); } @@ -552,7 +552,7 @@ class spell_voodoo : public SpellScriptLoader { PrepareSpellScript(spell_voodoo_SpellScript) - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_BREW) || !sSpellMgr->GetSpellInfo(SPELL_GHOSTLY) || !sSpellMgr->GetSpellInfo(SPELL_HEX1) || !sSpellMgr->GetSpellInfo(SPELL_HEX2) || @@ -569,13 +569,13 @@ class spell_voodoo : public SpellScriptLoader GetCaster()->CastSpell(target, spellid, false); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_voodoo_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_voodoo_SpellScript(); } diff --git a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp index ba7c34b6c05..936713a451a 100644 --- a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp @@ -74,7 +74,7 @@ class npc_risen_husk_spirit : public CreatureScript { npc_risen_husk_spiritAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() + void Reset() OVERRIDE { events.Reset(); if (me->GetEntry() == NPC_RISEN_HUSK) @@ -83,7 +83,7 @@ class npc_risen_husk_spirit : public CreatureScript events.ScheduleEvent(EVENT_INTANGIBLE_PRESENCE, 5000); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (killer->GetTypeId() == TYPEID_PLAYER) { @@ -95,7 +95,7 @@ class npc_risen_husk_spirit : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -126,7 +126,7 @@ class npc_risen_husk_spirit : public CreatureScript EventMap events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_risen_husk_spiritAI (creature); } @@ -157,7 +157,7 @@ class npc_theramore_guard : public CreatureScript public: npc_theramore_guard() : CreatureScript("npc_theramore_guard") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(QUEST_DISCREDITING_THE_DESERTERS) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_THERAMORE_GUARD, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO); @@ -167,7 +167,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(); @@ -185,7 +185,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_theramore_guardAI(creature); } @@ -198,13 +198,13 @@ public: uint32 Step; bool bYellTimer; - void Reset() + void Reset() OVERRIDE { bYellTimer = false; Step = 0; } - void UpdateAI(uint32 Diff) + void UpdateAI(uint32 Diff) OVERRIDE { if (!me->HasAura(SPELL_PROPAGANDIZED)) me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); @@ -249,7 +249,7 @@ class npc_lady_jaina_proudmoore : public CreatureScript public: npc_lady_jaina_proudmoore() : CreatureScript("npc_lady_jaina_proudmoore") { } - 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_SENDER_INFO) @@ -260,7 +260,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -289,7 +289,7 @@ class npc_nat_pagle : public CreatureScript public: npc_nat_pagle() : CreatureScript("npc_nat_pagle") { } - 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_TRADE) @@ -298,7 +298,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -342,7 +342,7 @@ class npc_private_hendel : public CreatureScript public: npc_private_hendel() : CreatureScript("npc_private_hendel") { } - bool OnQuestAccept(Player* /*player*/, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* /*player*/, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_MISSING_DIPLO_PT16) creature->setFaction(FACTION_HOSTILE); @@ -350,7 +350,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_private_hendelAI(creature); } @@ -359,12 +359,12 @@ public: { npc_private_hendelAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() + void Reset() OVERRIDE { me->RestoreFaction(); } - void AttackedBy(Unit* pAttacker) + void AttackedBy(Unit* pAttacker) OVERRIDE { if (me->GetVictim()) return; @@ -375,7 +375,7 @@ public: AttackStart(pAttacker); } - void DamageTaken(Unit* pDoneBy, uint32 &Damage) + void DamageTaken(Unit* pDoneBy, uint32 &Damage) OVERRIDE { if (Damage > me->GetHealth() || me->HealthBelowPctDamaged(20, Damage)) { @@ -409,7 +409,7 @@ class npc_zelfrax : public CreatureScript public: npc_zelfrax() : CreatureScript("npc_zelfrax") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_zelfraxAI(creature); } @@ -421,7 +421,7 @@ public: MoveToDock(); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who) return; @@ -436,7 +436,7 @@ public: } } - void MovementInform(uint32 Type, uint32 /*Id*/) + void MovementInform(uint32 Type, uint32 /*Id*/) OVERRIDE { if (Type != POINT_MOTION_TYPE) return; @@ -458,7 +458,7 @@ public: Talk(SAY_ZELFRAX2); } - void UpdateAI(uint32 /*Diff*/) + void UpdateAI(uint32 /*Diff*/) OVERRIDE { if (!UpdateVictim()) return; @@ -494,12 +494,12 @@ class npc_stinky : public CreatureScript public: npc_stinky() : CreatureScript("npc_stinky") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_stinkyAI(creature); } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_STINKYS_ESCAPE_H || quest->GetQuestId() == QUEST_STINKYS_ESCAPE_A) { @@ -518,7 +518,7 @@ public: { npc_stinkyAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -563,14 +563,14 @@ public: } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { Talk(SAY_ATTACKED_1, who->GetGUID()); } - void Reset() {} + void Reset() OVERRIDE {} - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Player* player = GetPlayerForEscort(); if (player && HasEscortState(STATE_ESCORT_ESCORTING)) @@ -583,7 +583,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { npc_escortAI::UpdateAI(uiDiff); @@ -612,7 +612,7 @@ class spell_ooze_zap : public SpellScriptLoader { PrepareSpellScript(spell_ooze_zap_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_OOZE_ZAP)) return false; @@ -637,14 +637,14 @@ class spell_ooze_zap : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_ooze_zap_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); OnCheckCast += SpellCheckCastFn(spell_ooze_zap_SpellScript::CheckRequirement); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_ooze_zap_SpellScript(); } @@ -659,7 +659,7 @@ class spell_ooze_zap_channel_end : public SpellScriptLoader { PrepareSpellScript(spell_ooze_zap_channel_end_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_OOZE_ZAP_CHANNEL_END)) return false; @@ -674,13 +674,13 @@ class spell_ooze_zap_channel_end : public SpellScriptLoader GetHitUnit()->Kill(GetHitUnit()); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_ooze_zap_channel_end_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_ooze_zap_channel_end_SpellScript(); } @@ -695,7 +695,7 @@ class spell_energize_aoe : public SpellScriptLoader { PrepareSpellScript(spell_energize_aoe_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ENERGIZED)) return false; @@ -720,7 +720,7 @@ class spell_energize_aoe : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), uint32(GetEffectValue()), true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_energize_aoe_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_energize_aoe_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); @@ -728,7 +728,7 @@ class spell_energize_aoe : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_energize_aoe_SpellScript(); } @@ -749,7 +749,7 @@ class go_blackhoof_cage : public GameObjectScript public: go_blackhoof_cage() : GameObjectScript("go_blackhoof_cage") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { go->UseDoorOrButton(); if (Creature* prisoner = go->FindNearestCreature(NPC_THERAMORE_PRISONER, 1.0f)) diff --git a/src/server/scripts/Kalimdor/zone_felwood.cpp b/src/server/scripts/Kalimdor/zone_felwood.cpp index 35c19ff17ba..45ef955ccbb 100644 --- a/src/server/scripts/Kalimdor/zone_felwood.cpp +++ b/src/server/scripts/Kalimdor/zone_felwood.cpp @@ -54,7 +54,7 @@ class npcs_riverbreeze_and_silversky : public CreatureScript public: npcs_riverbreeze_and_silversky() : CreatureScript("npcs_riverbreeze_and_silversky") { } - 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) @@ -65,7 +65,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); diff --git a/src/server/scripts/Kalimdor/zone_feralas.cpp b/src/server/scripts/Kalimdor/zone_feralas.cpp index 0b0130d3008..3402722e2d7 100644 --- a/src/server/scripts/Kalimdor/zone_feralas.cpp +++ b/src/server/scripts/Kalimdor/zone_feralas.cpp @@ -42,7 +42,7 @@ class npc_gregan_brewspewer : public CreatureScript public: npc_gregan_brewspewer() : CreatureScript("npc_gregan_brewspewer") { } - 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) @@ -55,7 +55,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -97,7 +97,7 @@ class npc_oox22fe : public CreatureScript public: npc_oox22fe() : CreatureScript("npc_oox22fe") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_RESCUE_OOX22FE) { @@ -118,7 +118,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_oox22feAI(creature); } @@ -127,7 +127,7 @@ public: { npc_oox22feAI(Creature* creature) : npc_escortAI(creature) { } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -162,20 +162,20 @@ public: } } - void Reset() + void Reset() OVERRIDE { if (!HasEscortState(STATE_ESCORT_ESCORTING)) me->SetStandState(UNIT_STAND_STATE_DEAD); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { //For an small probability the npc says something when he get aggro if (urand(0, 9) > 7) Talk(SAY_OOX_AGGRO); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } @@ -192,7 +192,7 @@ class npc_screecher_spirit : public CreatureScript public: npc_screecher_spirit() : CreatureScript("npc_screecher_spirit") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { player->SEND_GOSSIP_MENU(2039, creature->GetGUID()); player->TalkedToCreature(creature->GetEntry(), creature->GetGUID()); @@ -227,13 +227,13 @@ class spell_gordunni_trap : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnCast += SpellCastFn(spell_gordunni_trap_SpellScript::HandleDummy); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gordunni_trap_SpellScript(); } diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp index 5e6a0ca1ffa..2b9e89bfbf3 100644 --- a/src/server/scripts/Kalimdor/zone_moonglade.cpp +++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp @@ -62,7 +62,7 @@ class npc_bunthen_plainswind : public CreatureScript public: npc_bunthen_plainswind() : CreatureScript("npc_bunthen_plainswind") { } - 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) @@ -82,7 +82,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->getClass() != CLASS_DRUID) player->SEND_GOSSIP_MENU(4916, creature->GetGUID()); @@ -121,7 +121,7 @@ class npc_great_bear_spirit : public CreatureScript public: npc_great_bear_spirit() : CreatureScript("npc_great_bear_spirit") { } - 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) @@ -149,7 +149,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { //ally or horde quest if (player->GetQuestStatus(5929) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(5930) == QUEST_STATUS_INCOMPLETE) @@ -177,7 +177,7 @@ class npc_silva_filnaveth : public CreatureScript public: npc_silva_filnaveth() : CreatureScript("npc_silva_filnaveth") { } - 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) @@ -197,7 +197,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->getClass() != CLASS_DRUID) player->SEND_GOSSIP_MENU(4913, creature->GetGUID()); @@ -288,7 +288,7 @@ class npc_clintar_spirit : public CreatureScript public: npc_clintar_spirit() : CreatureScript("npc_clintar_spirit") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_clintar_spiritAI (creature); } @@ -310,7 +310,7 @@ public: bool EventOnWait; - void Reset() + void Reset() OVERRIDE { if (!PlayerGUID) { @@ -323,7 +323,7 @@ public: } } - void IsSummonedBy(Unit* /*summoner*/) + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE { std::list<Player*> playerOnQuestList; Trinity::AnyPlayerInObjectRangeCheck checker(me, 5.0f); @@ -345,7 +345,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (!PlayerGUID) return; @@ -359,7 +359,7 @@ public: } } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { Player* player = Unit::GetPlayer(*me, PlayerGUID); if (player && player->IsInCombat() && player->getAttackerForHelper()) @@ -384,7 +384,7 @@ public: return; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { npc_escortAI::UpdateAI(diff); @@ -547,7 +547,7 @@ public: } else if (EventOnWait) EventTimer -= diff; } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { CurrWP = waypointId; EventTimer = 0; @@ -594,7 +594,7 @@ public: EventMap events; - void MovementInform(uint32 type, uint32 pointId) + void MovementInform(uint32 type, uint32 pointId) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -608,19 +608,19 @@ public: } } - void EnterCombat(Unit* /*attacker*/) + void EnterCombat(Unit* /*attacker*/) OVERRIDE { events.Reset(); events.ScheduleEvent(EVENT_CAST_CLEAVE, urand(3000, 5000)); events.ScheduleEvent(EVENT_CAST_STARFALL, urand(8000, 10000)); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { DoCast(SPELL_OMEN_SUMMON_SPOTLIGHT); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_ELUNE_CANDLE) { @@ -631,7 +631,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -655,7 +655,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_omenAI(creature); } @@ -672,13 +672,13 @@ public: EventMap events; - void Reset() + void Reset() OVERRIDE { events.Reset(); events.ScheduleEvent(EVENT_DESPAWN, 5*MINUTE*IN_MILLISECONDS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { events.Update(diff); @@ -698,7 +698,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_giant_spotlightAI(creature); } diff --git a/src/server/scripts/Kalimdor/zone_mulgore.cpp b/src/server/scripts/Kalimdor/zone_mulgore.cpp index 0a068e4288e..435238cbc0d 100644 --- a/src/server/scripts/Kalimdor/zone_mulgore.cpp +++ b/src/server/scripts/Kalimdor/zone_mulgore.cpp @@ -46,7 +46,7 @@ class npc_skorn_whitecloud : public CreatureScript public: npc_skorn_whitecloud() : CreatureScript("npc_skorn_whitecloud") { } - 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) @@ -55,7 +55,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -91,7 +91,7 @@ class npc_kyle_frenzied : public CreatureScript public: npc_kyle_frenzied() : CreatureScript("npc_kyle_frenzied") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_kyle_frenziedAI (creature); } @@ -106,7 +106,7 @@ public: uint32 EventTimer; uint8 EventPhase; - void Reset() + void Reset() OVERRIDE { EventActive = false; IsMovingToLunch = false; @@ -118,7 +118,7 @@ public: me->UpdateEntry(NPC_KYLE_FRENZIED); } - void SpellHit(Unit* Caster, SpellInfo const* Spell) + void SpellHit(Unit* Caster, SpellInfo const* Spell) OVERRIDE { if (!me->GetVictim() && !EventActive && Spell->Id == SPELL_LUNCH) { @@ -138,7 +138,7 @@ public: } } - void MovementInform(uint32 Type, uint32 PointId) + void MovementInform(uint32 Type, uint32 PointId) OVERRIDE { if (Type != POINT_MOTION_TYPE || !EventActive) return; @@ -147,7 +147,7 @@ public: IsMovingToLunch = false; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (EventActive) { @@ -264,7 +264,7 @@ class npc_plains_vision : public CreatureScript public: npc_plains_vision() : CreatureScript("npc_plains_vision") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_plains_visionAI (creature); } @@ -277,16 +277,16 @@ public: uint8 WayPointId; uint8 amountWP; - void Reset() + void Reset() OVERRIDE { WayPointId = 0; newWaypoint = true; amountWP = 49; } - void EnterCombat(Unit* /*who*/){} + void EnterCombat(Unit* /*who*/)OVERRIDE {} - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -303,7 +303,7 @@ public: } } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (newWaypoint) { diff --git a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp index a497bc82abc..9f824f0f1f0 100644 --- a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp +++ b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp @@ -47,7 +47,7 @@ class npc_shenthul : public CreatureScript public: npc_shenthul() : CreatureScript("npc_shenthul") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_SHATTERED_SALUTE) { @@ -57,7 +57,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_shenthulAI (creature); } @@ -72,7 +72,7 @@ public: uint32 ResetTimer; uint64 PlayerGUID; - void Reset() + void Reset() OVERRIDE { CanTalk = false; CanEmote = false; @@ -81,9 +81,9 @@ public: PlayerGUID = 0; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (CanEmote) { @@ -114,7 +114,7 @@ public: DoMeleeAttackIfReady(); } - void ReceiveEmote(Player* player, uint32 emote) + void ReceiveEmote(Player* player, uint32 emote) OVERRIDE { if (emote == TEXT_EMOTE_SALUTE && player->GetQuestStatus(QUEST_SHATTERED_SALUTE) == QUEST_STATUS_INCOMPLETE) { @@ -155,7 +155,7 @@ class npc_thrall_warchief : public CreatureScript public: npc_thrall_warchief() : CreatureScript("npc_thrall_warchief") { } - 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) @@ -192,7 +192,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -204,7 +204,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_thrall_warchiefAI (creature); } @@ -216,15 +216,15 @@ public: uint32 ChainLightningTimer; uint32 ShockTimer; - void Reset() + void Reset() OVERRIDE { ChainLightningTimer = 2000; ShockTimer = 8000; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp index c6d92c1dcac..f20266dfb55 100644 --- a/src/server/scripts/Kalimdor/zone_silithus.cpp +++ b/src/server/scripts/Kalimdor/zone_silithus.cpp @@ -52,7 +52,7 @@ class npc_highlord_demitrian : public CreatureScript public: npc_highlord_demitrian() : CreatureScript("npc_highlord_demitrian") { } - 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) @@ -93,7 +93,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -139,7 +139,7 @@ class npcs_rutgar_and_frankal : public CreatureScript public: npcs_rutgar_and_frankal() : CreatureScript("npcs_rutgar_and_frankal") { } - 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) @@ -203,7 +203,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -489,7 +489,7 @@ class npc_anachronos_the_ancient : public CreatureScript public: npc_anachronos_the_ancient() : CreatureScript("npc_anachronos_the_ancient") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_anachronos_the_ancientAI(creature); } @@ -509,7 +509,7 @@ public: uint64 PlayerGUID; bool eventEnd; - void Reset() + void Reset() OVERRIDE { AnimationTimer = 1500; AnimationCount = 0; @@ -791,7 +791,7 @@ public: } ++AnimationCount; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (AnimationTimer) { @@ -817,7 +817,7 @@ class npc_qiraj_war_spawn : public CreatureScript public: npc_qiraj_war_spawn() : CreatureScript("npc_qiraj_war_spawn") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_qiraj_war_spawnAI(creature); } @@ -832,7 +832,7 @@ public: bool Timers; bool hasTarget; - void Reset() + void Reset() OVERRIDE { MobGUID = 0; PlayerGUID = 0; @@ -840,10 +840,10 @@ public: hasTarget = false; } - void EnterCombat(Unit* /*who*/) {} - void JustDied(Unit* /*slayer*/); + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void JustDied(Unit* /*slayer*/) OVERRIDE; - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!Timers) { @@ -930,7 +930,7 @@ class npc_anachronos_quest_trigger : public CreatureScript public: npc_anachronos_quest_trigger() : CreatureScript("npc_anachronos_quest_trigger") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_anachronos_quest_triggerAI(creature); } @@ -951,7 +951,7 @@ public: bool Announced; bool Failed; - void Reset() + void Reset() OVERRIDE { PlayerGUID = 0; @@ -1045,7 +1045,7 @@ public: Announced = false; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!PlayerGUID || !EventStarted) return; @@ -1092,7 +1092,7 @@ class go_crystalline_tear : public GameObjectScript public: go_crystalline_tear() : GameObjectScript("go_crystalline_tear") { } - bool OnQuestAccept(Player* player, GameObject* go, Quest const* quest) + bool OnQuestAccept(Player* player, GameObject* go, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_A_PAWN_ON_THE_ETERNAL_BOARD) { @@ -1363,7 +1363,7 @@ class go_wind_stone : public GameObjectScript } public: - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { uint8 rank = GetPlayerRank(player); @@ -1441,7 +1441,7 @@ class go_wind_stone : 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->PlayerTalkClass->SendCloseGossip(); diff --git a/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp b/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp index bb24a4a6286..058cd19e3b4 100644 --- a/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp +++ b/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp @@ -49,7 +49,7 @@ class npc_braug_dimspirit : public CreatureScript public: npc_braug_dimspirit() : CreatureScript("npc_braug_dimspirit") { } - 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) @@ -66,7 +66,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -117,7 +117,7 @@ public: { npc_kaya_flathoofAI(Creature* creature) : npc_escortAI(creature) {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -139,15 +139,15 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } - void Reset(){} + void Reset()OVERRIDE {} }; - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_PROTECT_KAYA) { @@ -161,7 +161,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_kaya_flathoofAI(creature); } diff --git a/src/server/scripts/Kalimdor/zone_tanaris.cpp b/src/server/scripts/Kalimdor/zone_tanaris.cpp index 06401766861..7bb499e0fd4 100644 --- a/src/server/scripts/Kalimdor/zone_tanaris.cpp +++ b/src/server/scripts/Kalimdor/zone_tanaris.cpp @@ -58,7 +58,7 @@ class npc_aquementas : public CreatureScript public: npc_aquementas() : CreatureScript("npc_aquementas") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_aquementasAI (creature); } @@ -74,7 +74,7 @@ public: uint32 FrostShockTimer; uint32 AquaJetTimer; - void Reset() + void Reset() OVERRIDE { SendItemTimer = 0; SwitchFactionTimer = 10000; @@ -101,12 +101,12 @@ public: } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { Talk(AGGRO_YELL_AQUE, who->GetGUID()); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (isFriendly) { @@ -175,7 +175,7 @@ class npc_custodian_of_time : public CreatureScript public: npc_custodian_of_time() : CreatureScript("npc_custodian_of_time") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_custodian_of_timeAI(creature); } @@ -184,7 +184,7 @@ public: { npc_custodian_of_timeAI(Creature* creature) : npc_escortAI(creature) {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (Player* player = GetPlayerForEscort()) { @@ -251,7 +251,8 @@ public: } } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (HasEscortState(STATE_ESCORT_ESCORTING)) return; @@ -269,10 +270,10 @@ public: } } - void EnterCombat(Unit* /*who*/) {} - void Reset() {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void Reset() OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { npc_escortAI::UpdateAI(diff); } @@ -289,7 +290,7 @@ class npc_marin_noggenfogger : public CreatureScript public: npc_marin_noggenfogger() : CreatureScript("npc_marin_noggenfogger") { } - 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_TRADE) @@ -298,7 +299,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -324,7 +325,7 @@ class npc_steward_of_time : public CreatureScript public: npc_steward_of_time() : CreatureScript("npc_steward_of_time") { } - bool OnQuestAccept(Player* player, Creature* /*creature*/, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* /*creature*/, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == 10279) //Quest: To The Master's Lair player->CastSpell(player, 34891, true); //(Flight through Caverns) @@ -332,7 +333,7 @@ public: return false; } - 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) @@ -341,7 +342,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -375,7 +376,7 @@ class npc_stone_watcher_of_norgannon : public CreatureScript public: npc_stone_watcher_of_norgannon() : CreatureScript("npc_stone_watcher_of_norgannon") { } - 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) @@ -408,7 +409,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -446,7 +447,7 @@ class npc_OOX17 : public CreatureScript public: npc_OOX17() : CreatureScript("npc_OOX17") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == Q_OOX17) { @@ -462,7 +463,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_OOX17AI(creature); } @@ -471,7 +472,7 @@ public: { npc_OOX17AI(Creature* creature) : npc_escortAI(creature) {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (Player* player = GetPlayerForEscort()) { @@ -499,14 +500,14 @@ public: } } - void Reset(){} + void Reset()OVERRIDE {} - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_OOX_AGGRO); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } @@ -541,7 +542,7 @@ class npc_tooga : public CreatureScript public: npc_tooga() : CreatureScript("npc_tooga") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_TOOGA) { @@ -552,7 +553,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_toogaAI(creature); } @@ -567,7 +568,7 @@ public: uint64 TortaGUID; - void Reset() + void Reset() OVERRIDE { CheckSpeechTimer = 2500; PostEventTimer = 1000; @@ -576,7 +577,8 @@ public: TortaGUID = 0; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { FollowerAI::MoveInLineOfSight(who); @@ -594,7 +596,7 @@ public: } } - void MovementInform(uint32 MotionType, uint32 PointId) + void MovementInform(uint32 MotionType, uint32 PointId) OVERRIDE { FollowerAI::MovementInform(MotionType, PointId); @@ -605,7 +607,7 @@ public: SetFollowComplete(); } - void UpdateFollowerAI(uint32 Diff) + void UpdateFollowerAI(uint32 Diff) OVERRIDE { if (!UpdateVictim()) { diff --git a/src/server/scripts/Kalimdor/zone_teldrassil.cpp b/src/server/scripts/Kalimdor/zone_teldrassil.cpp index 43fb5bf1de8..8cf08953fc2 100644 --- a/src/server/scripts/Kalimdor/zone_teldrassil.cpp +++ b/src/server/scripts/Kalimdor/zone_teldrassil.cpp @@ -50,7 +50,7 @@ class npc_mist : public CreatureScript public: npc_mist() : CreatureScript("npc_mist") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_MIST) if (npc_mistAI* pMistAI = CAST_AI(npc_mist::npc_mistAI, creature->AI())) @@ -59,7 +59,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_mistAI(creature); } @@ -68,9 +68,10 @@ public: { npc_mistAI(Creature* creature) : FollowerAI(creature) { } - void Reset() { } + void Reset() OVERRIDE {} + + void MoveInLineOfSight(Unit* who) OVERRIDE - void MoveInLineOfSight(Unit* who) { FollowerAI::MoveInLineOfSight(who); @@ -97,7 +98,7 @@ public: } //call not needed here, no known abilities - /*void UpdateFollowerAI(const uint32 Diff) + /*void UpdateFollowerAI(const uint32 Diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp index 80cb81aaaec..13b254ac0b2 100644 --- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp @@ -55,7 +55,7 @@ class npc_beaten_corpse : public CreatureScript public: npc_beaten_corpse() : CreatureScript("npc_beaten_corpse") { } - 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) @@ -66,7 +66,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(QUEST_LOST_IN_BATTLE) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(QUEST_LOST_IN_BATTLE) == QUEST_STATUS_COMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CORPSE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -102,7 +102,7 @@ class npc_gilthares : public CreatureScript public: npc_gilthares() : CreatureScript("npc_gilthares") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_FREE_FROM_HOLD) { @@ -117,7 +117,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_giltharesAI(creature); } @@ -126,9 +126,9 @@ public: { npc_giltharesAI(Creature* creature) : npc_escortAI(creature) { } - void Reset() { } + void Reset() OVERRIDE {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -158,7 +158,7 @@ public: } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { //not always use if (rand()%4) @@ -186,7 +186,7 @@ class npc_sputtervalve : public CreatureScript public: npc_sputtervalve() : CreatureScript("npc_sputtervalve") { } - 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) @@ -197,7 +197,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -227,7 +227,7 @@ class npc_taskmaster_fizzule : public CreatureScript public: npc_taskmaster_fizzule() : CreatureScript("npc_taskmaster_fizzule") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_taskmaster_fizzuleAI(creature); } @@ -244,7 +244,7 @@ public: uint32 ResetTimer; uint8 FlareCount; - void Reset() + void Reset() OVERRIDE { IsFriend = false; ResetTimer = 120000; @@ -265,7 +265,7 @@ public: me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_FLARE || spell->Id == SPELL_FOLLY) { @@ -276,9 +276,9 @@ public: } } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (IsFriend) { @@ -295,7 +295,7 @@ public: DoMeleeAttackIfReady(); } - void ReceiveEmote(Player* /*player*/, uint32 emote) + void ReceiveEmote(Player* /*player*/, uint32 emote) OVERRIDE { if (emote == TEXT_EMOTE_SALUTE) { @@ -343,7 +343,7 @@ class npc_twiggy_flathead : public CreatureScript public: npc_twiggy_flathead() : CreatureScript("npc_twiggy_flathead") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_twiggy_flatheadAI (creature); } @@ -363,7 +363,7 @@ public: uint64 AffrayChallenger[6]; uint64 BigWill; - void Reset() + void Reset() OVERRIDE { EventInProgress = false; EventGrate = false; @@ -381,9 +381,10 @@ public: BigWill = 0; } - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void MoveInLineOfSight(Unit* who) OVERRIDE - void MoveInLineOfSight(Unit* who) { if (!who || !who->IsAlive() || EventInProgress) return; @@ -397,9 +398,9 @@ public: } } - void KilledUnit(Unit* /*victim*/) { } + void KilledUnit(Unit* /*victim*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (EventInProgress) { Player* pWarrior = NULL; @@ -562,7 +563,7 @@ public: uint32 PostEventTimer; uint32 PostEventCount; - void Reset() + void Reset() OVERRIDE { if (!HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -575,7 +576,7 @@ public: } } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -598,7 +599,7 @@ public: } } - void WaypointStart(uint32 PointId) + void WaypointStart(uint32 PointId) OVERRIDE { Player* player = GetPlayerForEscort(); @@ -617,7 +618,7 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned->GetEntry() == NPC_PILOT_WIZZ) me->SetStandState(UNIT_STAND_STATE_DEAD); @@ -626,7 +627,7 @@ public: summoned->AI()->AttackStart(me); } - void UpdateEscortAI(const uint32 Diff) + void UpdateEscortAI(const uint32 Diff) OVERRIDE { if (!UpdateVictim()) { @@ -668,7 +669,7 @@ public: } }; - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_ESCAPE) { @@ -679,7 +680,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_wizzlecrank_shredderAI(creature); } diff --git a/src/server/scripts/Kalimdor/zone_thousand_needles.cpp b/src/server/scripts/Kalimdor/zone_thousand_needles.cpp index b4ed931ced4..9afa825972f 100644 --- a/src/server/scripts/Kalimdor/zone_thousand_needles.cpp +++ b/src/server/scripts/Kalimdor/zone_thousand_needles.cpp @@ -57,7 +57,7 @@ class npc_kanati : public CreatureScript public: npc_kanati() : CreatureScript("npc_kanati") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_PROTECT_KANATI) if (npc_kanatiAI* pEscortAI = CAST_AI(npc_kanati::npc_kanatiAI, creature->AI())) @@ -66,7 +66,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_kanatiAI(creature); } @@ -75,9 +75,9 @@ public: { npc_kanatiAI(Creature* creature) : npc_escortAI(creature) { } - void Reset() {} + void Reset() OVERRIDE {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -98,7 +98,7 @@ public: me->SummonCreature(NPC_GALAK_ASS, GalakLoc, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } @@ -142,7 +142,7 @@ class npc_lakota_windsong : public CreatureScript public: npc_lakota_windsong() : CreatureScript("npc_lakota_windsong") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_FREE_AT_LAST) { @@ -155,7 +155,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_lakota_windsongAI(creature); } @@ -164,9 +164,9 @@ public: { npc_lakota_windsongAI(Creature* creature) : npc_escortAI(creature) { } - void Reset() {} + void Reset() OVERRIDE {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -225,7 +225,7 @@ class npc_paoka_swiftmountain : public CreatureScript public: npc_paoka_swiftmountain() : CreatureScript("npc_paoka_swiftmountain") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_HOMEWARD) { @@ -238,7 +238,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_paoka_swiftmountainAI(creature); } @@ -247,9 +247,9 @@ public: { npc_paoka_swiftmountainAI(Creature* creature) : npc_escortAI(creature) { } - void Reset() {} + void Reset() OVERRIDE {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -294,7 +294,7 @@ class npc_plucky : public CreatureScript public: npc_plucky() : CreatureScript("npc_plucky") { } - 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) @@ -307,7 +307,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(QUEST_SCOOP) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_P, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -317,7 +317,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_pluckyAI(creature); } @@ -329,7 +329,7 @@ public: uint32 NormFaction; uint32 ResetTimer; - void Reset() + void Reset() OVERRIDE { ResetTimer = 120000; @@ -342,7 +342,7 @@ public: DoCast(me, SPELL_PLUCKY_CHICKEN, false); } - void ReceiveEmote(Player* player, uint32 TextEmote) + void ReceiveEmote(Player* player, uint32 TextEmote) OVERRIDE { if (player->GetQuestStatus(QUEST_SCOOP) == QUEST_STATUS_INCOMPLETE) { @@ -368,7 +368,7 @@ public: } } - void UpdateAI(uint32 Diff) + void UpdateAI(uint32 Diff) OVERRIDE { if (me->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP)) { @@ -404,7 +404,7 @@ class go_panther_cage : public GameObjectScript public: go_panther_cage() : GameObjectScript("go_panther_cage") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { go->UseDoorOrButton(); if (player->GetQuestStatus(5151) == QUEST_STATUS_INCOMPLETE) @@ -426,7 +426,7 @@ class npc_enraged_panther : public CreatureScript public: npc_enraged_panther() : CreatureScript("npc_enraged_panther") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_enraged_pantherAI(creature); } @@ -435,13 +435,13 @@ public: { npc_enraged_pantherAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->SetReactState(REACT_PASSIVE); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp index f7dd842070e..01dd65755f6 100644 --- a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp +++ b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp @@ -48,7 +48,7 @@ class npc_cairne_bloodhoof : public CreatureScript public: npc_cairne_bloodhoof() : CreatureScript("npc_cairne_bloodhoof") { } - 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_SENDER_INFO) @@ -59,7 +59,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -72,7 +72,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_cairne_bloodhoofAI (creature); } @@ -87,7 +87,7 @@ public: uint32 ThunderclapTimer; uint32 UppercutTimer; - void Reset() + void Reset() OVERRIDE { BerserkerChargeTimer = 30000; CleaveTimer = 5000; @@ -96,9 +96,9 @@ public: UppercutTimer = 10000; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp b/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp index 221eed14afe..3dc77e0cf04 100644 --- a/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp +++ b/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp @@ -57,7 +57,7 @@ class npc_ame : public CreatureScript public: npc_ame() : CreatureScript("npc_ame") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_CHASING_AME) { @@ -70,7 +70,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ameAI(creature); } @@ -81,7 +81,7 @@ public: uint32 DemoralizingShoutTimer; - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { if (Player* player = GetPlayerForEscort()) { @@ -110,23 +110,23 @@ public: } } - void Reset() + void Reset() OVERRIDE { DemoralizingShoutTimer = 5000; } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Player* player = GetPlayerForEscort()) player->FailQuest(QUEST_CHASING_AME); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { npc_escortAI::UpdateAI(diff); if (!UpdateVictim()) @@ -173,7 +173,7 @@ class npc_ringo : public CreatureScript public: npc_ringo() : CreatureScript("npc_ringo") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_A_LITTLE_HELP) { @@ -187,7 +187,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ringoAI(creature); } @@ -202,7 +202,7 @@ public: uint64 SpraggleGUID; - void Reset() + void Reset() OVERRIDE { FaintTimer = urand(30000, 60000); EndEventProgress = 0; @@ -210,7 +210,8 @@ public: SpraggleGUID = 0; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { FollowerAI::MoveInLineOfSight(who); @@ -230,7 +231,7 @@ public: } } - void SpellHit(Unit* /*pCaster*/, const SpellInfo* pSpell) + void SpellHit(Unit* /*pCaster*/, const SpellInfo* pSpell) OVERRIDE { if (HasFollowState(STATE_FOLLOW_INPROGRESS | STATE_FOLLOW_PAUSED) && pSpell->Id == SPELL_REVIVE_RINGO) ClearFaint(); @@ -261,7 +262,7 @@ public: SetFollowPaused(false); } - void UpdateFollowerAI(uint32 Diff) + void UpdateFollowerAI(uint32 Diff) OVERRIDE { if (!UpdateVictim()) { diff --git a/src/server/scripts/Kalimdor/zone_winterspring.cpp b/src/server/scripts/Kalimdor/zone_winterspring.cpp index fe39f1d3abc..e517afe6b46 100644 --- a/src/server/scripts/Kalimdor/zone_winterspring.cpp +++ b/src/server/scripts/Kalimdor/zone_winterspring.cpp @@ -45,7 +45,7 @@ class npc_rivern_frostwind : public CreatureScript public: npc_rivern_frostwind() : CreatureScript("npc_rivern_frostwind") { } - 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_TRADE) @@ -54,7 +54,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -294,7 +294,7 @@ class npc_ranshalla : public CreatureScript { public: npc_ranshalla() : CreatureScript("npc_ranshalla") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_GUARDIANS_ALTAR) { @@ -309,7 +309,7 @@ public: return false; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ranshallaAI(creature); } @@ -330,7 +330,7 @@ public: uint64 _voiceEluneGUID; uint64 _altarGUID; - void Reset() + void Reset() OVERRIDE { _delayTimer = 0; } @@ -396,7 +396,7 @@ public: StartNextDialogueText(SAY_PRIESTESS_ALTAR_3); } - void WaypointReached(uint32 pointId) + void WaypointReached(uint32 pointId) OVERRIDE { switch (pointId) { @@ -565,7 +565,7 @@ public: } - void UpdateEscortAI(const uint32 diff) + void UpdateEscortAI(const uint32 diff) OVERRIDE { DialogueUpdate(diff); @@ -598,7 +598,7 @@ class go_elune_fire : public GameObjectScript { public: go_elune_fire() : GameObjectScript("go_elune_fire") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE { // Check if we are using the torches or the altar bool isAltar = false; diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp index c4613bf4005..7a20d1f581c 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp @@ -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 900d975f4bf..057ee41a3a0 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 9b80ef9cfe4..5095f590fdb 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp @@ -92,7 +92,7 @@ public: bool volunteerWork; bool bFirstTime; - void Reset() + void Reset() OVERRIDE { uiOpFerTimer = urand(15*IN_MILLISECONDS, 20*IN_MILLISECONDS); @@ -120,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; @@ -130,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; @@ -138,7 +138,7 @@ public: ScriptedAI::AttackStart(who); } - void KilledUnit(Unit* Victim) + void KilledUnit(Unit* Victim) OVERRIDE { if (!Victim || Victim->GetTypeId() != TYPEID_PLAYER) return; @@ -146,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; @@ -167,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; @@ -283,7 +284,7 @@ public: bCanDown = true; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!instance) return; @@ -339,7 +340,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_jedoga_shadowseekerAI(creature); } @@ -363,7 +364,7 @@ public: bool bWalking; - void Reset() + void Reset() OVERRIDE { if (!instance) return; @@ -387,7 +388,7 @@ public: } } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (!killer || !instance) return; @@ -411,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; @@ -425,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; @@ -433,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; @@ -454,7 +456,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (instance && bCheckTimer <= diff) { @@ -506,7 +508,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_jedoga_initiandAI(creature); } @@ -546,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; @@ -591,7 +594,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_jedogas_aufseher_triggerAI(creature); } @@ -604,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 6ec2a416287..2cfc714c1f7 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -102,7 +102,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiBloodthirstTimer = 10*IN_MILLISECONDS; uiVanishTimer = urand(25*IN_MILLISECONDS, 35*IN_MILLISECONDS); @@ -116,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; @@ -245,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(); @@ -262,7 +262,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -270,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; @@ -330,7 +330,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_taldaramAI(creature); } @@ -351,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 @@ -364,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(); @@ -381,7 +382,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_taldaram_flamesphereAI(creature); } @@ -392,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/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 8de5baad0b8..a9f92521ef8 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -219,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); } @@ -255,7 +255,7 @@ public: uint8 drakeCount; - void Reset() + void Reset() OVERRIDE { m_bIsBerserk = false; m_bIsSoftEnraged = false; @@ -347,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(); @@ -365,7 +365,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_SARTHARION_DEATH); @@ -385,7 +385,7 @@ public: } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SARTHARION_SLAY); } @@ -402,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; @@ -549,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()) @@ -742,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); @@ -754,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; @@ -900,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); @@ -956,7 +956,7 @@ struct dummy_dragonAI : public ScriptedAI } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (m_bCanMoveFree && m_uiMoveNextTimer) { @@ -984,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); } @@ -999,7 +999,7 @@ public: bool m_bHasPortalOpen; - void Reset() + void Reset() OVERRIDE { m_uiShadowBreathTimer = 20000; m_uiShadowFissureTimer = 5000; @@ -1008,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()) @@ -1073,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); } @@ -1088,7 +1088,7 @@ public: bool m_bHasPortalOpen; - void Reset() + void Reset() OVERRIDE { m_uiShadowBreathTimer = 20000; m_uiShadowFissureTimer = 5000; @@ -1103,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()) @@ -1177,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); } @@ -1192,7 +1192,7 @@ public: bool m_bHasPortalOpen; - void Reset() + void Reset() OVERRIDE { m_uiShadowBreathTimer = 20000; m_uiShadowFissureTimer = 5000; @@ -1201,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()) @@ -1272,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); } @@ -1287,7 +1287,7 @@ public: InstanceScript* instance; uint32 uiDespawnTimer; - void Reset() + void Reset() OVERRIDE { uiDespawnTimer = 28000; if (instance) @@ -1311,7 +1311,7 @@ public: me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER, me); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -1354,7 +1354,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (uiDespawnTimer < uiDiff) { @@ -1382,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); } @@ -1397,7 +1397,7 @@ public: InstanceScript* instance; uint32 uiDespawnTimer; - void Reset() + void Reset() OVERRIDE { uiDespawnTimer = 28000; if (instance) @@ -1407,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); @@ -1449,7 +1449,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (uiDespawnTimer < uiDiff) { @@ -1477,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); } @@ -1495,7 +1495,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { if (instance) { @@ -1516,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) { @@ -1534,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 {} + }; }; @@ -1548,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); } @@ -1565,7 +1566,7 @@ public: uint32 TsunamiBuff_timer; uint32 entry; - void Reset() + void Reset() OVERRIDE { me->SetReactState(REACT_PASSIVE); Tsunami_Timer = 100; @@ -1575,7 +1576,7 @@ public: entry = 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (Tsunami_Timer <= diff) { @@ -1600,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); } @@ -1614,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); @@ -1623,7 +1624,7 @@ public: VoidBlast_Timer = 5000; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (VoidBlast_Timer <= diff) { @@ -1649,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); } @@ -1663,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()) @@ -1698,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; @@ -1718,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; @@ -1738,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/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 f844b8feb11..13c9bbd722c 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -221,7 +221,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); @@ -231,19 +231,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) { @@ -262,7 +262,7 @@ struct generic_halionAI : public BossAI } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || me->HasUnitState(UNIT_STATE_CASTING)) return; @@ -275,7 +275,7 @@ struct generic_halionAI : public BossAI DoMeleeAttackIfReady(); } - void SetData(uint32 index, uint32 dataValue) + void SetData(uint32 index, uint32 dataValue) OVERRIDE { switch (index) { @@ -287,7 +287,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); @@ -309,7 +309,7 @@ class boss_halion : public CreatureScript me->SetHomePosition(HalionSpawnPos); } - void Reset() + void Reset() OVERRIDE { generic_halionAI::Reset(); me->SetReactState(REACT_DEFENSIVE); @@ -317,14 +317,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); @@ -344,7 +344,7 @@ class boss_halion : public CreatureScript controller->AI()->SetData(DATA_FIGHT_PHASE, PHASE_ONE); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); @@ -362,7 +362,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)) { @@ -389,7 +389,7 @@ class boss_halion : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (events.IsInPhase(PHASE_TWO)) return; @@ -397,7 +397,7 @@ class boss_halion : public CreatureScript generic_halionAI::UpdateAI(diff); } - void ExecuteEvent(uint32 eventId) + void ExecuteEvent(uint32 eventId) OVERRIDE { switch (eventId) { @@ -431,7 +431,7 @@ class boss_halion : public CreatureScript } } - void SetData(uint32 index, uint32 value) + void SetData(uint32 index, uint32 value) OVERRIDE { switch (index) { @@ -447,7 +447,7 @@ class boss_halion : public CreatureScript Position _meteorStrikePos; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetRubySanctumAI<boss_halionAI>(creature); } @@ -478,7 +478,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); @@ -491,9 +491,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); @@ -502,7 +502,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))) { @@ -521,7 +521,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)) { @@ -543,7 +543,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) { @@ -557,7 +557,7 @@ class boss_twilight_halion : public CreatureScript } } - void ExecuteEvent(uint32 eventId) + void ExecuteEvent(uint32 eventId) OVERRIDE { switch (eventId) { @@ -576,7 +576,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); } @@ -595,7 +595,7 @@ class npc_halion_controller : public CreatureScript me->SetPhaseMask(me->GetPhaseMask() | 0x20, true); } - void Reset() + void Reset() OVERRIDE { _summons.DespawnAll(); _events.Reset(); @@ -606,12 +606,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(); @@ -619,7 +619,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; @@ -627,7 +627,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(); @@ -641,7 +641,7 @@ class npc_halion_controller : public CreatureScript _instance->SetBossState(DATA_HALION, FAIL); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -683,7 +683,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 @@ -750,7 +750,7 @@ class npc_halion_controller : public CreatureScript } } - void SetData(uint32 id, uint32 value) + void SetData(uint32 id, uint32 value) OVERRIDE { switch (id) { @@ -891,7 +891,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); } @@ -912,7 +912,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 @@ -928,7 +928,7 @@ class npc_orb_carrier : public CreatureScript me->SetFacingToObject(rotationFocus); // setInFront } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_SHOOT) { @@ -962,7 +962,7 @@ class npc_orb_carrier : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetRubySanctumAI<npc_orb_carrierAI>(creature); } @@ -981,7 +981,7 @@ class npc_meteor_strike_initial : public CreatureScript SetCombatMovement(false); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -994,7 +994,7 @@ class npc_meteor_strike_initial : public CreatureScript } } - void IsSummonedBy(Unit* summoner) + void IsSummonedBy(Unit* summoner) OVERRIDE { Creature* owner = summoner->ToCreature(); if (!owner) @@ -1029,14 +1029,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); } @@ -1058,7 +1058,7 @@ class npc_meteor_strike : public CreatureScript SetCombatMovement(false); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { if (action == ACTION_METEOR_STRIKE_BURN) { @@ -1068,14 +1068,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; @@ -1107,7 +1107,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); } @@ -1147,7 +1147,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))) @@ -1156,7 +1156,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); @@ -1170,7 +1170,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; @@ -1179,7 +1179,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); } @@ -1194,7 +1194,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); @@ -1204,13 +1204,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); } @@ -1226,30 +1226,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; @@ -1269,7 +1269,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); } @@ -1303,14 +1303,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; @@ -1328,7 +1328,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); } @@ -1353,13 +1353,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(); } @@ -1377,7 +1377,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; @@ -1403,7 +1403,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); @@ -1413,7 +1413,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); } @@ -1436,7 +1436,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; @@ -1463,7 +1463,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); @@ -1473,7 +1473,7 @@ class spell_halion_marks : public SpellScriptLoader uint32 _removeSpellId; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_halion_marks_AuraScript(_summonSpell, _removeSpell); } @@ -1507,13 +1507,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(); } @@ -1535,7 +1535,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; @@ -1560,7 +1560,7 @@ class spell_halion_twilight_realm_handlers : public SpellScriptLoader instance->SendEncounterUnit(ENCOUNTER_FRAME_UNK7); } - void Register() + void Register() OVERRIDE { if (!_isApply) { @@ -1575,7 +1575,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); } @@ -1594,7 +1594,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; @@ -1609,13 +1609,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(); } @@ -1664,13 +1664,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(); } @@ -1692,13 +1692,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(); } @@ -1726,14 +1726,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..cbb2686bc14 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()); @@ -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()) @@ -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,7 +298,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { 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 742333d07c4..8bff123af75 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -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 e0415b2652b..4068222f9b7 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -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,7 +537,7 @@ 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); } @@ -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,7 +837,7 @@ class npc_toc_druid : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { 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,7 +930,7 @@ class npc_toc_shaman : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { 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,7 +1034,7 @@ class npc_toc_paladin : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { 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,7 +1119,7 @@ class npc_toc_priest : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { 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,7 +1217,7 @@ 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); } @@ -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,7 +1308,7 @@ class npc_toc_warlock : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { 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,7 +1402,7 @@ class npc_toc_mage : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { 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,7 +1504,7 @@ class npc_toc_hunter : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { 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,7 +1596,7 @@ class npc_toc_boomkin : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { 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,7 +1700,7 @@ class npc_toc_warrior : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { 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,7 +1796,7 @@ class npc_toc_dk : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { 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,7 +1901,7 @@ class npc_toc_rogue : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { 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,7 +2027,7 @@ 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); } @@ -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,7 +2133,7 @@ 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); } @@ -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,7 +2185,7 @@ 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); } @@ -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,7 +2225,7 @@ 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); } @@ -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 c6f6e881b8f..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 @@ -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/DraktharonKeep/boss_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp index 690750bf586..34ced66c8be 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp @@ -70,7 +70,7 @@ class boss_dred : public CreatureScript InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { if (instance) instance->SetData(DATA_DRED_EVENT, NOT_STARTED); @@ -83,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; @@ -151,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; @@ -165,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); } @@ -194,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; @@ -215,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); } @@ -244,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; @@ -265,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); } @@ -285,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 0a06c8a7d23..f0e72d16f58 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -84,7 +84,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiConsumeTimer = 15*IN_MILLISECONDS; uiAuraCountTimer = 15500; @@ -103,7 +103,7 @@ public: instance->SetData(DATA_TROLLGORE_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -111,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()) @@ -161,7 +161,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -171,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; @@ -179,7 +179,7 @@ public: return 0; } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -187,7 +187,7 @@ public: Talk(SAY_KILL); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { lSummons.Summon(summon); if (summon->AI()) @@ -195,7 +195,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_trollgoreAI(creature); } @@ -208,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 faaa0da3968..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 @@ -127,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; @@ -135,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); @@ -150,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); @@ -165,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)) { @@ -182,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; @@ -207,7 +207,7 @@ class boss_devourer_of_souls : public CreatureScript Talk(textId); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { summons.DespawnAll(); @@ -236,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; @@ -250,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()) @@ -362,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); } @@ -375,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 cdbf445cb10..cfa149c134f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp @@ -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 4648b967764..e291ee0de70 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -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 0f56150326e..82dfcb716b6 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -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..3e2224208cc 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,7 +390,7 @@ 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); } @@ -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..3f1484badbc 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -35,7 +35,7 @@ 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); } @@ -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,7 +139,7 @@ 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); } @@ -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 3e7b46c06d0..c039b45b622 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -68,7 +68,7 @@ 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); } @@ -98,7 +98,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiStampedeTimer = 10*IN_MILLISECONDS; uiWhirlingSlashTimer = 21*IN_MILLISECONDS; @@ -122,7 +122,7 @@ public: instance->SetData(DATA_GAL_DARAH_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -130,7 +130,7 @@ public: instance->SetData(DATA_GAL_DARAH_EVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -257,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; @@ -265,7 +265,7 @@ public: return 0; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -273,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; @@ -291,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 8577f0f2851..0ccaea316ef 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -52,7 +52,7 @@ 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); } @@ -73,7 +73,7 @@ public: uint32 uiDeterminedStabTimer; uint32 uiTransformationTImer; - void Reset() + void Reset() OVERRIDE { uiGroundTremorTimer = 18*IN_MILLISECONDS; uiNumblingShoutTimer = 10*IN_MILLISECONDS; @@ -85,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); @@ -94,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()) @@ -145,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; @@ -153,7 +153,7 @@ public: return 0; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -161,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; @@ -179,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 bd355514315..3081c68b58b 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -74,7 +74,7 @@ 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); } @@ -98,7 +98,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { uiPoisonNovaTimer = 10*IN_MILLISECONDS; uiPowerfullBiteTimer = 3*IN_MILLISECONDS; @@ -113,7 +113,7 @@ public: instance->SetData(DATA_SLAD_RAN_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -121,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()) @@ -175,7 +175,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); lSummons.DespawnAll(); @@ -184,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); @@ -214,7 +214,7 @@ 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); } @@ -225,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; @@ -267,7 +267,7 @@ 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); } @@ -280,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; @@ -307,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 4c07f7a4ce7..0f46888fbe7 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -254,7 +254,7 @@ class boss_deathbringer_saurfang : public CreatureScript _fallenChampionCastCount = 0; } - void Reset() + void Reset() OVERRIDE { _Reset(); me->SetReactState(REACT_DEFENSIVE); @@ -271,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; @@ -311,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; @@ -323,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; @@ -373,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); @@ -384,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; @@ -397,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) { @@ -416,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; @@ -505,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)) @@ -515,7 +515,7 @@ class boss_deathbringer_saurfang : public CreatureScript } // intro setup - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -580,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); } @@ -601,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) { @@ -657,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) { @@ -666,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) { @@ -711,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()) @@ -770,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) @@ -782,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(); @@ -792,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); } @@ -810,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) { @@ -862,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) { @@ -871,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) { @@ -891,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()) @@ -918,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) @@ -930,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(); @@ -940,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); } @@ -958,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) { @@ -973,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); @@ -985,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); } @@ -1000,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; @@ -1015,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(); } @@ -1036,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; @@ -1051,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(); } @@ -1078,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); } @@ -1094,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(); } @@ -1121,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; @@ -1135,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(); } @@ -1156,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; @@ -1170,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(); } @@ -1191,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; @@ -1245,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); @@ -1255,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(); } @@ -1270,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; } @@ -1286,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(); } @@ -1313,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(); } @@ -1330,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 92855d35fbd..bf85fe455c7 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -90,7 +90,7 @@ class boss_festergut : public CreatureScript _gasDummyGUID = 0; } - void Reset() + void Reset() OVERRIDE { _Reset(); me->SetReactState(REACT_DEFENSIVE); @@ -112,7 +112,7 @@ class boss_festergut : public CreatureScript } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (!instance->CheckRequiredBosses(DATA_FESTERGUT, who->ToPlayer())) { @@ -130,7 +130,7 @@ class boss_festergut : public CreatureScript DoZoneInCombat(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); @@ -140,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; @@ -241,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); @@ -271,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); } @@ -289,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; @@ -331,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()) @@ -343,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); } @@ -358,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; } @@ -373,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(); } @@ -394,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; @@ -411,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(); } @@ -432,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; @@ -447,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(); } @@ -464,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 6d8a561a013..0367a29bb30 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 > 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 a90767bbb77..3c28483337b 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -506,7 +506,7 @@ class boss_the_lich_king : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _Reset(); me->SetReactState(REACT_PASSIVE); @@ -516,7 +516,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); @@ -527,7 +527,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())) { @@ -549,7 +549,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); @@ -563,13 +563,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(); @@ -580,13 +580,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) { @@ -630,7 +630,7 @@ class boss_the_lich_king : public CreatureScript } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -645,7 +645,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) { @@ -660,7 +660,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)) { @@ -705,7 +705,7 @@ class boss_the_lich_king : public CreatureScript } } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { switch (summon->GetEntry()) { @@ -765,7 +765,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()) { @@ -782,13 +782,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) { @@ -797,7 +797,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; @@ -863,7 +863,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))) @@ -1154,7 +1154,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); } @@ -1172,14 +1172,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; @@ -1197,7 +1197,7 @@ class npc_tirion_fordring_tft : public CreatureScript } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -1215,7 +1215,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); @@ -1223,7 +1223,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) { @@ -1234,7 +1234,7 @@ class npc_tirion_fordring_tft : public CreatureScript } } - void JustReachedHome() + void JustReachedHome() OVERRIDE { me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); @@ -1244,7 +1244,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; @@ -1304,7 +1304,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); } @@ -1322,14 +1322,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)) { @@ -1338,7 +1338,7 @@ class npc_shambling_horror_icc : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1373,7 +1373,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); } @@ -1391,7 +1391,7 @@ class npc_raging_spirit : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _events.Reset(); _events.ScheduleEvent(EVENT_SOUL_SHRIEK, urand(12000, 15000)); @@ -1403,14 +1403,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); @@ -1418,7 +1418,7 @@ class npc_raging_spirit : public CreatureScript summon->SetTempSummonType(TEMPSUMMON_CORPSE_DESPAWN); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1449,7 +1449,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); } @@ -1467,7 +1467,7 @@ class npc_valkyr_shadowguard : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _events.Reset(); me->SetReactState(REACT_PASSIVE); @@ -1475,13 +1475,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; @@ -1498,7 +1498,7 @@ class npc_valkyr_shadowguard : public CreatureScript } } - void JustReachedHome() + void JustReachedHome() OVERRIDE { // schedule siphon life event (heroic only) DoZoneInCombat(); @@ -1506,11 +1506,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; @@ -1548,12 +1548,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; @@ -1597,7 +1597,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); } @@ -1615,7 +1615,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); @@ -1628,7 +1628,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; @@ -1646,7 +1646,7 @@ class npc_strangulate_vehicle : public CreatureScript lichKing->AI()->SummonedCreatureDespawn(me); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { UpdateVictim(); @@ -1704,7 +1704,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); } @@ -1722,12 +1722,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) { @@ -1754,7 +1754,7 @@ class npc_terenas_menethil : public CreatureScript } } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { // no running back home if (!me->IsAlive()) @@ -1764,7 +1764,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()) { @@ -1785,7 +1785,7 @@ class npc_terenas_menethil : public CreatureScript } } - void IsSummonedBy(Unit* /*summoner*/) + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE { _events.Reset(); _events.SetPhase(PHASE_OUTRO); @@ -1796,7 +1796,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(); @@ -1857,7 +1857,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); } @@ -1875,20 +1875,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; @@ -1916,7 +1916,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); } @@ -1933,7 +1933,7 @@ class npc_spirit_bomb : public CreatureScript { } - void IsSummonedBy(Unit* /*summoner*/) + void IsSummonedBy(Unit* /*summoner*/) OVERRIDE { float destX, destY, destZ; me->GetPosition(destX, destY); @@ -1942,7 +1942,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; @@ -1952,18 +1952,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); } @@ -1980,28 +1980,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(); @@ -2029,7 +2029,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); } @@ -2062,14 +2062,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(); } @@ -2084,7 +2084,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; @@ -2111,13 +2111,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(); } @@ -2132,7 +2132,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; @@ -2159,7 +2159,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); @@ -2172,7 +2172,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; @@ -2225,7 +2225,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); @@ -2236,12 +2236,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(); } @@ -2262,13 +2262,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(); } @@ -2291,13 +2291,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(); } @@ -2312,7 +2312,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; } @@ -2329,14 +2329,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(); } @@ -2351,7 +2351,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; @@ -2373,13 +2373,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(); } @@ -2394,7 +2394,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; @@ -2407,13 +2407,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(); } @@ -2457,7 +2457,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); @@ -2465,7 +2465,7 @@ class spell_the_lich_king_defile : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_the_lich_king_defile_SpellScript(); } @@ -2494,13 +2494,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(); } @@ -2515,7 +2515,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; @@ -2528,13 +2528,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(); } @@ -2549,14 +2549,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; @@ -2590,7 +2590,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); @@ -2600,7 +2600,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(); } @@ -2615,7 +2615,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(); } @@ -2626,13 +2626,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(); } @@ -2652,13 +2652,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(); } @@ -2673,7 +2673,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; @@ -2685,13 +2685,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(); } @@ -2706,7 +2706,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; @@ -2718,7 +2718,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); } @@ -2726,7 +2726,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(); } @@ -2747,13 +2747,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(); } @@ -2768,7 +2768,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; @@ -2793,7 +2793,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); @@ -2802,7 +2802,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(); } @@ -2817,7 +2817,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; } @@ -2837,13 +2837,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(); } @@ -2858,7 +2858,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; } @@ -2870,13 +2870,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(); } @@ -2906,14 +2906,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(); } @@ -2936,13 +2936,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(); } @@ -2957,7 +2957,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; @@ -2986,7 +2986,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); @@ -2995,7 +2995,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(); } @@ -3010,7 +3010,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; @@ -3024,13 +3024,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(); } @@ -3045,7 +3045,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; } @@ -3057,13 +3057,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(); } @@ -3084,13 +3084,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(); } @@ -3114,13 +3114,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(); } @@ -3144,13 +3144,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(); } @@ -3171,13 +3171,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(); } @@ -3192,7 +3192,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; @@ -3206,13 +3206,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(); } @@ -3223,7 +3223,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; @@ -3237,7 +3237,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..99ce75cc49b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -60,7 +60,7 @@ 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); } @@ -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 3cb93f7ac14..b723c2f4139 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -67,7 +67,7 @@ class boss_faerlina : public CreatureScript } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Talk(SAY_AGGRO); @@ -76,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) { @@ -94,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) { @@ -117,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; @@ -125,7 +126,7 @@ class boss_faerlina : public CreatureScript return 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -176,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); } @@ -194,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); @@ -202,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))) @@ -213,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); } @@ -224,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..affddf974b0 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -87,7 +87,7 @@ 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); } @@ -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 02b6d54f33d..bc879445fcc 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -56,7 +56,7 @@ 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); } @@ -69,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)) { @@ -81,7 +82,7 @@ public: BossAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_WOUND, 10000); @@ -91,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..99203ffa0c7 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -49,7 +49,7 @@ 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); } @@ -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 ac3755b1468..ff0ed31b724 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -59,7 +59,7 @@ 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); } @@ -73,7 +73,7 @@ public: bool safetyDance; Phases phase; - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (!(rand()%5)) Talk(SAY_SLAY); @@ -81,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; @@ -95,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); @@ -136,7 +136,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim() || !CheckInRoom()) return; @@ -202,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(); } @@ -221,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..28c711511d6 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,7 +647,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { 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..f81cbc38b0f 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -63,7 +63,7 @@ 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); } @@ -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,7 +154,7 @@ 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); } @@ -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..50fe1b45d7c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -73,7 +73,7 @@ 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); } @@ -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..342cb9156a4 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -55,7 +55,7 @@ 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); } @@ -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 5f86c1beb40..67fa2544d8e 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -61,7 +61,7 @@ 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); } @@ -70,13 +70,13 @@ public: { 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)) @@ -85,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); @@ -102,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..455df2dedff 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,7 +401,7 @@ class boss_sapphiron : public CreatureScript Map* _map; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { 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..e9eb7556259 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -108,7 +108,7 @@ 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); } @@ -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..7f2c7a93970 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()) { @@ -1546,7 +1547,7 @@ public: { } - 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,7 +1573,7 @@ public: InstanceScript* _instance; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { 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,7 +1638,7 @@ public: EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_wyrmrest_skytalonAI (creature); } @@ -1656,14 +1657,14 @@ 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); } @@ -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 0ad0dbc45db..fdc4927763e 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -86,7 +86,7 @@ class boss_anomalus : public CreatureScript uint64 uiChaoticRiftGUID; bool chaosTheory; - void Reset() + void Reset() OVERRIDE { Phase = 0; uiSparkTimer = 5000; @@ -97,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); @@ -105,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); @@ -113,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; @@ -121,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; @@ -183,7 +183,7 @@ class boss_anomalus : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_anomalusAI(creature); } @@ -207,7 +207,7 @@ class npc_chaotic_rift : public CreatureScript uint32 uiChaoticEnergyBurstTimer; uint32 uiSummonCrazedManaWraithTimer; - void Reset() + void Reset() OVERRIDE { uiChaoticEnergyBurstTimer = 1000; uiSummonCrazedManaWraithTimer = 5000; @@ -215,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; @@ -251,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); } @@ -264,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 bbe50ee908b..a28c044c583 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp @@ -47,7 +47,7 @@ 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); } @@ -56,11 +56,12 @@ public: { 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()) @@ -68,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..33800b92eb4 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp @@ -41,7 +41,7 @@ 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); } @@ -50,10 +50,11 @@ public: { 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..c0f12347cf1 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -58,7 +58,7 @@ 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); } @@ -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 947d17e446f..e7c9ecdccfa 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -63,7 +63,7 @@ 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); } @@ -96,7 +96,7 @@ public: uint8 splitPersonality; time_t time[3]; - void Reset() + void Reset() OVERRIDE { Phase = 0; //These times are probably wrong @@ -122,7 +122,7 @@ public: instance->SetData(DATA_MAGUS_TELESTRA_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -130,7 +130,7 @@ public: instance->SetData(DATA_MAGUS_TELESTRA_EVENT, IN_PROGRESS); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -138,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) { @@ -157,7 +157,7 @@ public: } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_SPLIT_PERSONALITY) return splitPersonality; @@ -194,7 +194,7 @@ public: return 0; } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { if (summon->IsAlive()) return; @@ -216,7 +216,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -347,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..3da59e614e7 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,7 +155,7 @@ public: }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { 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/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp index 1a820cd3727..e9ba50a3b9d 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp @@ -55,7 +55,7 @@ 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); } @@ -64,7 +64,7 @@ public: { 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,7 +149,7 @@ 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); } @@ -158,7 +158,7 @@ public: { 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..2cab18b45e8 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -83,7 +83,7 @@ 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); } @@ -92,7 +92,7 @@ public: { 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 f1df85853ca..95596f621e0 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -92,7 +92,7 @@ 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); } @@ -101,7 +101,7 @@ public: { 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..11385a8f95a 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -57,7 +57,7 @@ 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); } @@ -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 a6f03866ae1..2077049641f 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -97,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); } @@ -137,7 +137,7 @@ public: uint64 m_auiStormforgedLieutenantGUID[2]; - void Reset() + void Reset() OVERRIDE { if (canBuff) if (!me->HasAura(SPELL_TEMPORARY_ELECTRICAL_CHARGE)) @@ -184,7 +184,7 @@ public: instance->SetData(TYPE_BJARNGRIM, NOT_STARTED); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { if (me->HasAura(SPELL_TEMPORARY_ELECTRICAL_CHARGE)) canBuff = true; @@ -194,7 +194,7 @@ public: ScriptedAI::EnterEvadeMode(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -205,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); @@ -235,7 +235,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -389,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); } @@ -406,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) { @@ -424,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 a6fe9d35d94..d8ab71870a8 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -67,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); } @@ -87,7 +87,7 @@ public: uint32 m_uiHealthAmountModifier; - void Reset() + void Reset() OVERRIDE { m_uiArcLightning_Timer = 15000; m_uiLightningNova_Timer = 20000; @@ -102,7 +102,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -113,7 +113,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -124,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()) @@ -209,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/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..61251b05ee1 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -56,7 +56,7 @@ 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); } @@ -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..ee06304086c 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,7 +56,7 @@ 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); } @@ -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 ad8710fefcc..2ee8d4d70de 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -84,7 +84,7 @@ 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); } @@ -111,7 +111,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { bIsFrenzy = false; @@ -130,7 +130,7 @@ public: instance->SetData(DATA_SJONNIR_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -149,7 +149,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -207,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)) @@ -215,7 +215,7 @@ public: lSummons.Summon(summon); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); lSummons.DespawnAll(); @@ -224,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; @@ -232,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; @@ -254,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); } @@ -265,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) { @@ -297,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); } @@ -311,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))) @@ -328,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 6c5138da826..7b5c7f2e061 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -137,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); } @@ -162,7 +162,7 @@ public: std::list<uint64> KaddrakGUIDList; - void Reset() + void Reset() OVERRIDE { uiKaddrakEncounterTimer = 1500; uiMarnakEncounterTimer = 10000; @@ -209,7 +209,7 @@ public: }*/ } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (bKaddrakActivated) { @@ -270,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) @@ -282,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()); @@ -293,7 +293,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_brann_hosAI(creature); } @@ -317,7 +317,7 @@ public: bool bIsLowHP; bool brannSparklinNews; - void Reset() + void Reset() OVERRIDE { if (!HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -348,7 +348,7 @@ public: lDwarfGUIDList.clear(); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -402,7 +402,7 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { lDwarfGUIDList.push_back(summoned->GetGUID()); summoned->AddThreat(me, 0.0f); @@ -423,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; @@ -437,7 +437,7 @@ public: return 0; } - void UpdateEscortAI(const uint32 uiDiff) + void UpdateEscortAI(const uint32 uiDiff) OVERRIDE { if (uiPhaseTimer <= uiDiff) { @@ -744,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/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 a8c51534683..e2a8ab25cac 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp @@ -109,7 +109,7 @@ class boss_auriaya : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _Reset(); DefenderGUID = 0; @@ -118,7 +118,7 @@ class boss_auriaya : public CreatureScript nineLives = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Talk(SAY_AGGRO); @@ -131,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); @@ -158,7 +158,7 @@ class boss_auriaya : public CreatureScript } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -179,7 +179,7 @@ class boss_auriaya : public CreatureScript } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -192,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) { @@ -205,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; @@ -279,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); } @@ -297,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(); @@ -313,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); } @@ -331,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; @@ -377,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); @@ -388,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); } @@ -406,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; @@ -452,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))) @@ -464,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); } @@ -496,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(); } @@ -522,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(); } @@ -543,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; @@ -563,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 b57925cf2a8..29a07bac01c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -228,7 +228,7 @@ class boss_flame_leviathan : public CreatureScript { } - void InitializeAI() + void InitializeAI() OVERRIDE { ASSERT(vehicle); if (!me->isDead()) @@ -261,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 @@ -271,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); @@ -321,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 @@ -330,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); @@ -342,7 +342,7 @@ class boss_flame_leviathan : public CreatureScript ++Shutdown; } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -360,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; @@ -465,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 { @@ -553,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); } @@ -577,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; @@ -617,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); } @@ -636,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; @@ -659,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; @@ -667,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); } @@ -682,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; @@ -696,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); } @@ -713,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; @@ -733,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); } @@ -750,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); @@ -759,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); } @@ -784,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); @@ -802,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) { @@ -827,7 +827,7 @@ class npc_mechanolift : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_mechanoliftAI(creature); } @@ -847,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); } @@ -881,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; @@ -896,7 +896,7 @@ class npc_colossus : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_colossusAI(creature); } @@ -915,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)) { @@ -924,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); @@ -933,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); } @@ -944,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); } @@ -958,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); @@ -1010,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)) { @@ -1019,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); @@ -1028,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); } @@ -1048,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) { @@ -1071,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); } @@ -1091,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; @@ -1113,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); } @@ -1134,7 +1136,7 @@ class npc_lorekeeper : public CreatureScript { } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { // Start encounter if (action == ACTION_SPAWN_VEHICLES) @@ -1150,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(); @@ -1193,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) @@ -1206,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); } @@ -1223,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) @@ -1246,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) @@ -1267,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) @@ -1300,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()) { @@ -1317,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()) { @@ -1334,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()) { @@ -1351,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()) @@ -1367,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()) @@ -1382,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; @@ -1400,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; @@ -1418,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; @@ -1436,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; @@ -1481,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(); } @@ -1547,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(); } @@ -1590,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(); } @@ -1655,7 +1657,7 @@ class spell_pursue : public SpellScriptLoader { PrepareSpellScript(spell_pursue_SpellScript); - bool Load() + bool Load() OVERRIDE { _target = NULL; return true; @@ -1702,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); @@ -1712,7 +1714,7 @@ class spell_pursue : public SpellScriptLoader WorldObject* _target; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pursue_SpellScript(); } @@ -1771,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 36cdcbf9889..38864effe9f 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -112,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(); @@ -122,7 +122,7 @@ class boss_general_vezax : public CreatureScript vaporCount = 0; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); @@ -138,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; @@ -207,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); @@ -240,7 +240,7 @@ class boss_general_vezax : public CreatureScript } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -253,7 +253,7 @@ class boss_general_vezax : public CreatureScript return 0; } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -305,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); } @@ -323,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; @@ -367,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); } @@ -389,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); @@ -413,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 @@ -437,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); } @@ -458,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(); } @@ -479,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; @@ -497,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(); } @@ -516,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; @@ -536,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 5954206c956..2fb165b935e 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -191,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; @@ -216,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); @@ -233,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); } @@ -258,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); @@ -273,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)) { @@ -294,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); } @@ -319,7 +319,7 @@ class boss_hodir : public CreatureScript bool iHaveTheCoolestFriends; bool iCouldSayThatThisCacheWasRare; - void Reset() + void Reset() OVERRIDE { _Reset(); me->SetReactState(REACT_PASSIVE); @@ -329,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); @@ -349,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()) { @@ -385,7 +385,7 @@ class boss_hodir : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -464,7 +464,7 @@ class boss_hodir : public CreatureScript DoMeleeAttackIfReady(); } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -502,7 +502,7 @@ class boss_hodir : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<boss_hodirAI>(creature); }; @@ -524,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) { @@ -550,7 +550,7 @@ class npc_icicle : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<npc_icicleAI>(creature); }; @@ -572,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) { @@ -590,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); }; @@ -608,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; @@ -656,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); @@ -667,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); }; @@ -685,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; @@ -718,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); @@ -729,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); }; @@ -747,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; @@ -779,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); @@ -790,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); }; @@ -808,7 +808,7 @@ class npc_hodir_mage : public CreatureScript instance = me->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { events.Reset(); summons.DespawnAll(); @@ -816,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; @@ -859,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); @@ -871,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); }; @@ -889,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) { @@ -905,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); }; @@ -951,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); } @@ -961,7 +961,7 @@ class spell_biting_cold : public SpellScriptLoader TargetList listOfTargets; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_biting_cold_AuraScript(); } @@ -989,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 3685e18f31c..fb835b5a4d9 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -192,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) { @@ -223,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; @@ -247,7 +247,7 @@ class boss_razorscale_controller : public CreatureScript } } - void UpdateAI(uint32 Diff) + void UpdateAI(uint32 Diff) OVERRIDE { events.Update(Diff); @@ -298,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); } @@ -309,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)) @@ -339,7 +339,7 @@ class boss_razorscale : public CreatureScript bool PermaGround; bool Enraged; - void Reset() + void Reset() OVERRIDE { _Reset(); me->SetCanFly(true); @@ -351,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)) @@ -366,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) { @@ -389,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) @@ -398,7 +398,7 @@ class boss_razorscale : public CreatureScript return 0; } - void UpdateAI(uint32 Diff) + void UpdateAI(uint32 Diff) OVERRIDE { if (!UpdateVictim()) return; @@ -566,7 +566,7 @@ class boss_razorscale : public CreatureScript } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -579,7 +579,7 @@ class boss_razorscale : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return GetUlduarAI<boss_razorscaleAI>(creature); } @@ -607,7 +607,7 @@ class npc_expedition_commander : public CreatureScript Creature* Engineer[4]; Creature* Defender[4]; - void Reset() + void Reset() OVERRIDE { AttackStartTimer = 0; Phase = 0; @@ -615,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) { @@ -624,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) { @@ -643,7 +644,7 @@ class npc_expedition_commander : public CreatureScript } } - void UpdateAI(uint32 Diff) + void UpdateAI(uint32 Diff) OVERRIDE { if (AttackStartTimer <= Diff) { @@ -703,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) @@ -716,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) @@ -732,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); } @@ -757,7 +758,7 @@ class npc_mole_machine_trigger : public CreatureScript bool GobSummoned; bool NpcSummoned; - void Reset() + void Reset() OVERRIDE { SummonGobTimer = 2000; SummonNpcTimer = 6000; @@ -766,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) { @@ -806,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); } @@ -831,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); } @@ -855,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; @@ -886,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); } @@ -903,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; @@ -941,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); } @@ -960,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; @@ -1000,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); } @@ -1027,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(); } @@ -1058,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(); } @@ -1077,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); } @@ -1088,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 cb363684dc1..a41f156ec24 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 @@ -98,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); } @@ -115,7 +115,7 @@ public: bool bIsUndead; - void Reset() + void Reset() OVERRIDE { if (bIsUndead) me->UpdateEntry(NPC_INGVAR_HUMAN); @@ -137,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) { @@ -171,7 +171,7 @@ public: Talk(YELL_AGGRO_2); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (!bIsUndead) Talk(YELL_AGGRO_1); @@ -182,7 +182,7 @@ public: me->SetInCombatWithZone(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(YELL_DEAD_2); @@ -203,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; @@ -285,7 +285,7 @@ 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); } @@ -302,7 +302,7 @@ public: uint32 uiResurectTimer; uint32 uiResurectPhase; - void Reset() + void Reset() OVERRIDE { //! HACK: Creature's can't have MOVEMENTFLAG_FLYING me->SetHover(true); @@ -319,7 +319,7 @@ public: } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -344,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) { @@ -397,7 +398,7 @@ 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); } @@ -408,7 +409,7 @@ public: { } - void Reset() + void Reset() OVERRIDE { if (Creature* target = me->FindNearestCreature(NPC_THROW_TARGET, 50.0f)) { @@ -421,7 +422,7 @@ public: 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..83a10a6e74d 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,7 +114,7 @@ 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); } @@ -123,7 +123,7 @@ public: { 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,7 +249,7 @@ 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); } @@ -258,14 +258,14 @@ public: { 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 20d69ebf80d..8abe451f572 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -85,7 +85,7 @@ 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); } @@ -107,7 +107,7 @@ public: bool Dalronn_isDead; bool Enraged; - void Reset() + void Reset() OVERRIDE { Charge_Timer = 5000; StoneStrike_Timer = 10000; @@ -126,7 +126,7 @@ public: } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (!ghost && instance) { @@ -140,7 +140,7 @@ public: } } - void DamageTaken(Unit* /*attacker*/, uint32& damage) + void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE { if (!Enraged && !ghost && me->HealthBelowPctDamaged(15, damage)) { @@ -149,7 +149,7 @@ public: } } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (!ghost && instance) { @@ -179,7 +179,7 @@ public: } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { if (!ghost) { @@ -187,7 +187,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (ghost) { @@ -249,7 +249,7 @@ 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); } @@ -273,7 +273,7 @@ public: uint32 AggroYell_Timer; bool Skarvald_isDead; - void Reset() + void Reset() OVERRIDE { ShadowBolt_Timer = 1000; Debilitate_Timer = 5000; @@ -293,7 +293,7 @@ public: } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (!ghost && instance) { @@ -308,7 +308,7 @@ public: } } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (!ghost && instance) { @@ -339,7 +339,7 @@ public: } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { if (!ghost) { @@ -347,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/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index c1d12c63a0b..9974989b9b2 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -88,7 +88,7 @@ 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); } @@ -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,7 +277,7 @@ 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); } @@ -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,7 +390,7 @@ 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); } @@ -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,7 +506,7 @@ 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); } @@ -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,7 +626,7 @@ 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); } @@ -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,7 +732,7 @@ 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); } @@ -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 bc385a67971..4b035f0b534 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -160,7 +160,7 @@ 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); } @@ -190,7 +190,7 @@ public: CombatPhase Phase; - void Reset() + void Reset() OVERRIDE { triggersGUID.clear(); @@ -215,7 +215,7 @@ public: } } - void JustReachedHome() + void JustReachedHome() OVERRIDE { me->SetCanFly(false); me->Dismount(); @@ -224,7 +224,7 @@ public: 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); @@ -246,7 +246,7 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { switch (summoned->GetEntry()) { @@ -269,14 +269,14 @@ public: Summons.Summon(summoned); } - void SummonedCreatureDespawn(Creature* summoned) + void SummonedCreatureDespawn(Creature* summoned) OVERRIDE { 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) { @@ -302,7 +302,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { switch (Phase) { @@ -407,7 +407,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); Summons.DespawnAll(); @@ -415,7 +415,7 @@ public: instance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, DONE); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } @@ -469,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 1d45a032d90..8b6a695b3a6 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -114,7 +114,7 @@ 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); } @@ -150,7 +150,7 @@ public: bool sacrificed; - void Reset() + void Reset() OVERRIDE { sacrificed = false; SetCombatMovement(true); @@ -174,7 +174,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -185,7 +185,7 @@ public: instance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, IN_PROGRESS); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { if (summon->GetEntry() == NPC_RITUAL_CHANNELER) summon->CastSpell(summon, SPELL_SUMMONED_VIS, true); @@ -193,12 +193,13 @@ public: 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; @@ -219,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); @@ -240,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) { @@ -252,7 +253,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (Phase == IDLE) return; @@ -455,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); } @@ -472,7 +473,7 @@ public: InstanceScript* instance; uint32 paralyzeTimer; - void Reset() + void Reset() OVERRIDE { paralyzeTimer = 1600; if (instance) @@ -480,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; @@ -504,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); } @@ -513,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) { @@ -560,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(); } @@ -584,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() == NPC_SVALA_SORROWGRAVE) killedByRitualStrike = true; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -632,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); } @@ -643,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 e1dcbb30c91..a54a1b6bec7 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -103,7 +103,7 @@ 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); } @@ -157,7 +157,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { m_bIsPause = false; m_bIsActiveWithBJORN = false; @@ -188,7 +188,7 @@ public: instance->SetData(DATA_KING_YMIRON_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -196,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; @@ -210,7 +210,7 @@ public: return 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (m_bIsWalking) { @@ -368,7 +368,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -379,7 +379,7 @@ public: instance->SetData(DATA_KING_YMIRON_EVENT, DONE); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } @@ -403,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/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp index 57ea9b980cb..e44e0ab0539 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp @@ -72,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); @@ -83,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; @@ -128,7 +128,7 @@ class boss_archavon : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_archavonAI(creature); } @@ -150,7 +150,7 @@ class npc_archavon_warder : public CreatureScript EventMap events; - void Reset() + void Reset() OVERRIDE { events.Reset(); events.ScheduleEvent(EVENT_ROCK_SHOWER, 2000); @@ -158,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; @@ -199,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 37eb335153c..1ceddd4bd66 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -80,7 +80,7 @@ class boss_emalon : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _Reset(); @@ -88,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); @@ -97,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()) { @@ -117,7 +117,7 @@ class boss_emalon : public CreatureScript _EnterCombat(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -166,7 +166,7 @@ class boss_emalon : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_emalonAI(creature); } @@ -187,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)) { @@ -205,7 +205,7 @@ class npc_tempest_minion : public CreatureScript } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { DoZoneInCombat(); events.ScheduleEvent(EVENT_SHOCK, 20000); @@ -217,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()) @@ -266,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 feed6b05ee7..22174ea2528 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp @@ -65,7 +65,7 @@ class boss_toravon : public CreatureScript { } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoCast(me, SPELL_FROZEN_MALLET); @@ -76,7 +76,7 @@ class boss_toravon : public CreatureScript _EnterCombat(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -112,7 +112,7 @@ class boss_toravon : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_toravonAI(creature); } @@ -130,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(); @@ -144,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; @@ -167,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); } @@ -187,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) { @@ -222,7 +222,7 @@ public: bool done; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_frozen_orbAI(creature); } @@ -250,7 +250,7 @@ class npc_frozen_orb_stalker : public CreatureScript SetCombatMovement(false); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (spawned) return; @@ -275,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 f89cf9a4466..bdb2f7e88f1 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp @@ -59,7 +59,7 @@ class instance_archavon : public InstanceMapScript } } - uint64 GetData64(uint32 identifier) const + uint64 GetData64(uint32 identifier) const OVERRIDE { switch (identifier) { @@ -133,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/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index 67bac18081f..c8e2155486a 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -48,7 +48,7 @@ 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); } @@ -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..f8f67cedfe8 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -47,7 +47,7 @@ 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); } @@ -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,7 +264,7 @@ 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); } @@ -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 daf022c6da4..abb8c2c8b23 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -76,7 +76,7 @@ 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); } @@ -99,7 +99,7 @@ public: SummonList m_waterElements; - void Reset() + void Reset() OVERRIDE { bIsExploded = false; bIsFrenzy = false; @@ -119,7 +119,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -140,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; @@ -154,7 +154,7 @@ public: } } - void DoAction(int32 param) + void DoAction(int32 param) OVERRIDE { if (!me->IsAlive()) return; @@ -198,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; @@ -206,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; @@ -276,7 +277,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -303,7 +304,7 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned) { @@ -314,7 +315,7 @@ public: } } - void SummonedCreatureDespawn(Creature* summoned) + void SummonedCreatureDespawn(Creature* summoned) OVERRIDE { if (summoned) { @@ -323,7 +324,7 @@ public: } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -339,7 +340,7 @@ 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); } @@ -355,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) { @@ -387,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))) @@ -405,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..91b78a5a684 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp @@ -35,7 +35,7 @@ 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); } @@ -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..b2309f8f055 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -31,7 +31,7 @@ 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); } @@ -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..6c483de9acb 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -61,7 +61,7 @@ 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); } @@ -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,7 +229,7 @@ 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); } @@ -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 59f9a1d0e35..8021a9c5db4 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -56,7 +56,7 @@ 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); } @@ -75,7 +75,7 @@ public: uint32 SpellShroudOfDarknessTimer; bool voidDance; - void Reset() + void Reset() OVERRIDE { if (instance) { @@ -91,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; @@ -105,7 +105,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); if (instance) @@ -123,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()) @@ -153,13 +154,13 @@ public: DoMeleeAttackIfReady(); } - void SummonedCreatureDies(Creature* summoned, Unit* /*who*/) + void SummonedCreatureDies(Creature* summoned, Unit* /*who*/) OVERRIDE { 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; @@ -167,7 +168,7 @@ public: return 0; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -186,7 +187,7 @@ public: } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -194,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); @@ -211,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 0bd6a6ee670..64c327aa919 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -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,7 +422,7 @@ 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); } @@ -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,7 +808,7 @@ 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); } @@ -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,7 +886,7 @@ 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); } @@ -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,7 +964,7 @@ 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); } @@ -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,7 +1024,7 @@ 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); } @@ -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,7 +1076,7 @@ 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); } @@ -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,7 +1208,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_azure_spellbreakerAI (creature); } @@ -1218,7 +1219,7 @@ 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); } @@ -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,7 +1271,7 @@ 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); } @@ -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/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 4430d8f5a8c..c4a93f931d8 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -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); } @@ -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) @@ -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) @@ -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); } @@ -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,7 +454,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { 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); } @@ -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); } @@ -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) { @@ -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); } @@ -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); } @@ -1344,7 +1349,7 @@ public: uint32 deflectionTimer; uint32 soulBlastTimer; - void Reset() + void Reset() OVERRIDE { leryssaGUID = 0; arlosGUID = 0; @@ -1353,7 +1358,7 @@ public: deflectionTimer = urand(20000, 25000); 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) { @@ -1401,7 +1406,7 @@ public: 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); } @@ -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); } @@ -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); } @@ -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); } @@ -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); } @@ -2110,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) { @@ -2138,7 +2144,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_seaforium_depth_chargeAI(creature); } @@ -2165,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) { @@ -2189,7 +2195,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_valiance_keep_cannoneerAI(creature); } @@ -2223,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) { @@ -2294,7 +2300,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_warmage_coldarraAI(creature); } @@ -2350,7 +2356,7 @@ public: uint64 uiPlayerGUID; - void Reset() + void Reset() OVERRIDE { if (uiEmoteState) me->SetUInt32Value(UNIT_NPC_EMOTESTATE, uiEmoteState); @@ -2368,7 +2374,7 @@ public: me->RestoreFaction(); } - void DoAction(int32 /*iParam*/) + void DoAction(int32 /*iParam*/) OVERRIDE { me->StopMoving(); me->SetUInt32Value(UNIT_NPC_FLAGS, 0); @@ -2378,7 +2384,7 @@ public: uiEventPhase = 1; } - void SetGUID(uint64 uiGuid, int32 /*iId*/) + void SetGUID(uint64 uiGuid, int32 /*iId*/) OVERRIDE { uiPlayerGUID = uiGuid; } @@ -2390,7 +2396,7 @@ public: me->AI()->AttackStart(player); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (uiEventTimer && uiEventTimer <= uiDiff) { @@ -2451,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; @@ -2491,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 4670f1b6054..0ae31d08182 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); } @@ -142,7 +143,7 @@ class npc_hira_snowdawn : public CreatureScript public: npc_hira_snowdawn() : CreatureScript("npc_hira_snowdawn") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (!creature->IsVendor() || !creature->IsTrainer()) return false; @@ -157,7 +158,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_TRAIN) diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index a17abeba726..0357ea075f4 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -54,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()); @@ -66,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) @@ -132,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(); } @@ -164,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(); } @@ -207,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) { @@ -220,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) @@ -243,7 +243,7 @@ class npc_wyrmrest_defender : public CreatureScript uint32 RenewRecoveryChecker; - void Reset() + void Reset() OVERRIDE { hpWarningReady = true; renewRecoveryCanCheck = false; @@ -251,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), @@ -273,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) { @@ -297,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 c43074ff838..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); } @@ -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); } @@ -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) @@ -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 287dedc7970..ef58138c653 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -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) @@ -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) @@ -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); } @@ -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); } @@ -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 5c3cd880e55..c1bca1dae76 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -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); } @@ -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) @@ -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); } @@ -369,7 +369,7 @@ public: uint32 m_uiChatTimer; - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); @@ -408,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)) { @@ -422,7 +422,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { npc_escortAI::UpdateAI(uiDiff); @@ -438,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) { @@ -509,7 +509,7 @@ public: { npc_jungle_punch_targetAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { sayTimer = 3500; sayStep = 0; @@ -519,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()) @@ -584,7 +585,7 @@ public: timer -= diff; } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (phase) proceedCwEvent(uiDiff); @@ -638,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; @@ -690,7 +691,7 @@ public: uint64 orphanGUID; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_jungle_punch_targetAI(creature); } @@ -735,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; @@ -758,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; @@ -853,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(); } @@ -976,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(); } @@ -1013,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; @@ -1029,7 +1030,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_haiphoonAI(creature); } @@ -1067,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; @@ -1109,7 +1110,7 @@ public: } } - void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_LAND) { @@ -1122,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 ef95ba2e5b1..e334dbe834a 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); @@ -124,7 +124,7 @@ 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()) @@ -143,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) @@ -182,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; @@ -202,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; @@ -217,7 +217,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_brunnhildar_prisonerAI(creature); } @@ -254,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; @@ -269,7 +269,7 @@ public: events.ScheduleEvent(EVENT_REACHED_HOME, 2000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { events.Update(diff); @@ -310,7 +310,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_freed_protodrakeAI(creature); } @@ -325,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) { @@ -338,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); @@ -359,7 +359,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_icefangAI (creature); } @@ -380,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; @@ -389,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. @@ -407,7 +407,7 @@ 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); } @@ -427,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); } @@ -444,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); } @@ -454,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(); } diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp index 79755c0f57d..f5d04154686 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp @@ -773,7 +773,7 @@ class OutdoorPvP_eastern_plaguelands : public OutdoorPvPScript { } - OutdoorPvP* GetOutdoorPvP() const + OutdoorPvP* GetOutdoorPvP() const OVERRIDE { return new OutdoorPvPEP(); } diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp index 0ffab435a9c..4fd9f380350 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp @@ -368,7 +368,7 @@ class OutdoorPvP_hellfire_peninsula : public OutdoorPvPScript { } - OutdoorPvP* GetOutdoorPvP() const + OutdoorPvP* GetOutdoorPvP() const OVERRIDE { return new OutdoorPvPHP(); } diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp index 21ad544dceb..32a819e2e0d 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp @@ -669,7 +669,7 @@ class OutdoorPvP_nagrand : public OutdoorPvPScript { } - OutdoorPvP* GetOutdoorPvP() const + OutdoorPvP* GetOutdoorPvP() const OVERRIDE { return new OutdoorPvPNA(); } diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp index 242f3fab985..41ebf577f68 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp @@ -244,7 +244,7 @@ class OutdoorPvP_silithus : public OutdoorPvPScript { } - OutdoorPvP* GetOutdoorPvP() const + OutdoorPvP* GetOutdoorPvP() const OVERRIDE { return new OutdoorPvPSI(); } diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp index 98b0ee5c5f4..7a7efd2c81d 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp @@ -366,7 +366,7 @@ class OutdoorPvP_terokkar_forest : public OutdoorPvPScript { } - OutdoorPvP* GetOutdoorPvP() const + OutdoorPvP* GetOutdoorPvP() const OVERRIDE { return new OutdoorPvPTF(); } diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp index f8780435996..1308d61f333 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp @@ -460,7 +460,7 @@ class OutdoorPvP_zangarmarsh : public OutdoorPvPScript { } - OutdoorPvP* GetOutdoorPvP() const + OutdoorPvP* GetOutdoorPvP() const OVERRIDE { return new OutdoorPvPZM(); } diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp index 8e6741ab9af..becf30e1210 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -54,7 +54,7 @@ class npc_stolen_soul : public CreatureScript public: npc_stolen_soul() : CreatureScript("npc_stolen_soul") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_stolen_soulAI (creature); } @@ -66,12 +66,12 @@ public: uint8 myClass; uint32 Class_Timer; - void Reset() + void Reset() OVERRIDE { Class_Timer = 1000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } void SetMyClass(uint8 myclass) @@ -79,7 +79,7 @@ public: myClass = myclass; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -156,7 +156,7 @@ class boss_exarch_maladaar : public CreatureScript public: boss_exarch_maladaar() : CreatureScript("boss_exarch_maladaar") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_exarch_maladaarAI (creature); } @@ -179,7 +179,7 @@ public: bool HasTaunted; bool Avatar_summoned; - void Reset() + void Reset() OVERRIDE { soulmodel = 0; soulholder = 0; @@ -192,7 +192,8 @@ public: Avatar_summoned = false; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!HasTaunted && me->IsWithinDistInMap(who, 150.0f)) { @@ -203,12 +204,12 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned->GetEntry() == ENTRY_STOLEN_SOUL) { @@ -226,7 +227,7 @@ public: } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { if (rand()%2) return; @@ -234,14 +235,14 @@ public: Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); //When Exarch Maladar is defeated D'ore appear. me->SummonCreature(19412, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 600000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -306,7 +307,7 @@ class npc_avatar_of_martyred : public CreatureScript public: npc_avatar_of_martyred() : CreatureScript("npc_avatar_of_martyred") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_avatar_of_martyredAI (creature); } @@ -317,16 +318,16 @@ public: uint32 Mortal_Strike_timer; - void Reset() + void Reset() OVERRIDE { Mortal_Strike_timer = 10000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index daa8d68a292..86eb9e33a7e 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -53,7 +53,7 @@ class boss_shirrak_the_dead_watcher : public CreatureScript public: boss_shirrak_the_dead_watcher() : CreatureScript("boss_shirrak_the_dead_watcher") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_shirrak_the_dead_watcherAI (creature); } @@ -71,7 +71,7 @@ public: uint64 FocusedTargetGUID; - void Reset() + void Reset() OVERRIDE { Inhibitmagic_Timer = 0; Attractmagic_Timer = 28000; @@ -80,10 +80,10 @@ public: FocusedTargetGUID = 0; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned && summoned->GetEntry() == NPC_FOCUS_FIRE) { @@ -97,7 +97,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Inhibitmagic_Timer if (Inhibitmagic_Timer <= diff) @@ -165,7 +165,7 @@ class npc_focus_fire : public CreatureScript public: npc_focus_fire() : CreatureScript("npc_focus_fire") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_focus_fireAI (creature); } @@ -179,16 +179,16 @@ public: uint32 FieryBlast_Timer; bool fiery1, fiery2; - void Reset() + void Reset() OVERRIDE { FieryBlast_Timer = 3000+(rand()%1000); fiery1 = fiery2 = true; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp index 5b603984ea4..ee315d1d42b 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -71,7 +71,7 @@ class boss_nexusprince_shaffar : public CreatureScript public: boss_nexusprince_shaffar() : CreatureScript("boss_nexusprince_shaffar") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_nexusprince_shaffarAI (creature); } @@ -91,7 +91,7 @@ public: bool HasTaunted; bool CanBlink; - void Reset() + void Reset() OVERRIDE { Blink_Timer = 1500; Beacon_Timer = 10000; @@ -110,13 +110,14 @@ public: me->SummonCreature(NPC_BEACON, posX + dist, posY, posZ, angle, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 7200000); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { summons.DespawnAll(); ScriptedAI::EnterEvadeMode(); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!HasTaunted && who->GetTypeId() == TYPEID_PLAYER && me->IsWithinDistInMap(who, 100.0f)) { @@ -125,7 +126,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -133,7 +134,7 @@ public: summons.DoZoneInCombat(); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned->GetEntry() == NPC_BEACON) { @@ -146,23 +147,23 @@ public: summons.Summon(summoned); } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { summons.Despawn(summon); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEAD); summons.DespawnAll(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -231,7 +232,7 @@ class npc_ethereal_beacon : public CreatureScript public: npc_ethereal_beacon() : CreatureScript("npc_ethereal_beacon") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ethereal_beaconAI (creature); } @@ -251,14 +252,14 @@ public: me->Kill(me); } - void Reset() + void Reset() OVERRIDE { Apprentice_Timer = DUNGEON_MODE(20000, 10000); ArcaneBolt_Timer = 1000; Check_Timer = 1000; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { // Send Shaffar to fight Creature* Shaffar = me->FindNearestCreature(NPC_SHAFFAR, 100); @@ -271,12 +272,12 @@ public: Shaffar->AI()->AttackStart(who); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me->GetVictim()); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -323,7 +324,7 @@ class npc_ethereal_apprentice : public CreatureScript public: npc_ethereal_apprentice() : CreatureScript("npc_ethereal_apprentice") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ethereal_apprenticeAI (creature); } @@ -336,13 +337,13 @@ public: bool isFireboltTurn; - void Reset() + void Reset() OVERRIDE { Cast_Timer = 3000; isFireboltTurn = true; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp index e4d8d959941..aa24e964df9 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp @@ -45,7 +45,7 @@ class boss_pandemonius : public CreatureScript public: boss_pandemonius() : CreatureScript("boss_pandemonius") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_pandemoniusAI (creature); } @@ -60,29 +60,29 @@ public: uint32 DarkShell_Timer; uint32 VoidBlast_Counter; - void Reset() + void Reset() OVERRIDE { VoidBlast_Timer = 8000+rand()%15000; DarkShell_Timer = 20000; VoidBlast_Counter = 0; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp index a70c3a1e7f4..3ba2fd9d19a 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp @@ -56,7 +56,7 @@ class boss_darkweaver_syth : public CreatureScript public: boss_darkweaver_syth() : CreatureScript("boss_darkweaver_syth") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_darkweaver_sythAI (creature); } @@ -77,7 +77,7 @@ public: bool summon50; bool summon10; - void Reset() + void Reset() OVERRIDE { flameshock_timer = 2000; arcaneshock_timer = 4000; @@ -90,17 +90,17 @@ public: summon10 = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { if (rand()%2) return; @@ -108,7 +108,7 @@ public: Talk(SAY_SLAY); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) summoned->AI()->AttackStart(target); @@ -127,7 +127,7 @@ public: DoCast(me, SPELL_SUMMON_SYTH_SHADOW, true); //right } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -211,16 +211,16 @@ public: uint32 flameshock_timer; uint32 flamebuffet_timer; - void Reset() + void Reset() OVERRIDE { me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); flameshock_timer = 2500; flamebuffet_timer = 5000; } - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -245,7 +245,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_syth_fireAI (creature); } @@ -256,7 +256,7 @@ class npc_syth_arcane : public CreatureScript public: npc_syth_arcane() : CreatureScript("npc_syth_arcane") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_syth_arcaneAI (creature); } @@ -270,16 +270,16 @@ public: uint32 arcaneshock_timer; uint32 arcanebuffet_timer; - void Reset() + void Reset() OVERRIDE { me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_ARCANE, true); arcaneshock_timer = 2500; arcanebuffet_timer = 5000; } - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -310,7 +310,7 @@ class npc_syth_frost : public CreatureScript public: npc_syth_frost() : CreatureScript("npc_syth_frost") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_syth_frostAI (creature); } @@ -324,16 +324,16 @@ public: uint32 frostshock_timer; uint32 frostbuffet_timer; - void Reset() + void Reset() OVERRIDE { me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true); frostshock_timer = 2500; frostbuffet_timer = 5000; } - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -365,7 +365,7 @@ class npc_syth_shadow : public CreatureScript public: npc_syth_shadow() : CreatureScript("npc_syth_shadow") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_syth_shadowAI (creature); } @@ -379,16 +379,16 @@ public: uint32 shadowshock_timer; uint32 shadowbuffet_timer; - void Reset() + void Reset() OVERRIDE { me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_SHADOW, true); shadowshock_timer = 2500; shadowbuffet_timer = 5000; } - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp index b9a2fc62e8e..9333f19d41a 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp @@ -53,7 +53,7 @@ class boss_talon_king_ikiss : public CreatureScript public: boss_talon_king_ikiss() : CreatureScript("boss_talon_king_ikiss") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_talon_king_ikissAI (creature); } @@ -76,7 +76,7 @@ public: bool Blink; bool Intro; - void Reset() + void Reset() OVERRIDE { ArcaneVolley_Timer = 5000; Sheep_Timer = 8000; @@ -87,7 +87,8 @@ public: ManaShield = false; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!me->GetVictim() && me->CanCreatureAttack(who)) { @@ -109,12 +110,12 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -122,12 +123,12 @@ public: instance->SetData(DATA_IKISSDOOREVENT, DONE); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp index a9091075075..d44789f4c39 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp @@ -42,7 +42,7 @@ class instance_sethekk_halls : public InstanceMapScript public: instance_sethekk_halls() : InstanceMapScript("instance_sethekk_halls", 556) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_sethekk_halls_InstanceMapScript(map); } @@ -77,7 +77,7 @@ public: m_uiIkissDoorGUID = go->GetGUID(); } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp index c7477171710..ffadfccecfe 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp @@ -50,7 +50,7 @@ class boss_ambassador_hellmaw : public CreatureScript public: boss_ambassador_hellmaw() : CreatureScript("boss_ambassador_hellmaw") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_ambassador_hellmawAI(creature); } @@ -72,7 +72,7 @@ public: bool IsBanished; bool Enraged; - void Reset() + void Reset() OVERRIDE { EventCheck_Timer = 5000; CorrosiveAcid_Timer = urand(5000, 10000); @@ -89,13 +89,14 @@ public: } } - void JustReachedHome() + void JustReachedHome() OVERRIDE { if (instance) instance->SetData(TYPE_HELLMAW, FAIL); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (me->HasAura(SPELL_BANISH)) return; @@ -103,7 +104,7 @@ public: npc_escortAI::MoveInLineOfSight(who); } - void WaypointReached(uint32 /*waypointId*/) + void WaypointReached(uint32 /*waypointId*/) OVERRIDE { } @@ -127,17 +128,17 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -145,7 +146,7 @@ public: instance->SetData(TYPE_HELLMAW, DONE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!Intro && !HasEscortState(STATE_ESCORT_ESCORTING)) { diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp index 307e8c8a2c6..573acfce5c2 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp @@ -65,7 +65,7 @@ public: { boss_blackheart_the_inciterAI(Creature* creature) : BossAI(creature, DATA_BLACKHEARTTHEINCITEREVENT) { } - void Reset() + void Reset() OVERRIDE { InciteChaos = false; @@ -73,12 +73,12 @@ public: instance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, NOT_STARTED); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -86,7 +86,7 @@ public: instance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, DONE); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { events.ScheduleEvent(EVENT_INCITE_CHAOS_WAIT, 15000); events.ScheduleEvent(EVENT_INCITE_CHAOS, 20000); @@ -99,7 +99,7 @@ public: instance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -150,13 +150,12 @@ public: private: bool InciteChaos; - - CreatureAI* GetAI(Creature* creature) const - { - return new boss_blackheart_the_inciterAI (creature); - } }; + CreatureAI* GetAI(Creature* creature) const OVERRIDE + { + return new boss_blackheart_the_inciterAI(creature); + } }; void AddSC_boss_blackheart_the_inciter() diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp index 115c75c2f17..088913b13d2 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp @@ -84,16 +84,16 @@ public: uint32 move; bool sacrificed; - void Reset() + void Reset() OVERRIDE { VorpilGUID = 0; move = 0; sacrificed = false; } - void EnterCombat(Unit* /*who*/){} + void EnterCombat(Unit* /*who*/)OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!VorpilGUID) { @@ -133,13 +133,12 @@ public: move = 1000; } else move -= diff; } - - CreatureAI* GetAI(Creature* creature) const - { - return new npc_voidtravelerAI (creature); - } }; + CreatureAI* GetAI(Creature* creature) const OVERRIDE + { + return new npc_voidtravelerAI(creature); + } }; class boss_grandmaster_vorpil : public CreatureScript @@ -154,7 +153,7 @@ public: Intro = false; } - void Reset() + void Reset() OVERRIDE { HelpYell = false; sumportals = false; @@ -209,18 +208,18 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned && summoned->GetEntry() == NPC_VOID_TRAVELER) CAST_AI(npc_voidtraveler::npc_voidtravelerAI, summoned->AI())->VorpilGUID = me->GetGUID(); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); destroyPortals(); @@ -229,7 +228,7 @@ public: instance->SetData(DATA_GRANDMASTERVORPILEVENT, DONE); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, urand(7000, 14000)); if (IsHeroic()) @@ -245,7 +244,8 @@ public: _EnterCombat(); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { ScriptedAI::MoveInLineOfSight(who); @@ -256,7 +256,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -312,12 +312,13 @@ public: bool sumportals; uint64 PortalsGuid[5]; - CreatureAI* GetAI(Creature* creature) const - { - return new boss_grandmaster_vorpilAI (creature); - } + }; + CreatureAI* GetAI(Creature* creature) const OVERRIDE + { + return new boss_grandmaster_vorpilAI(creature); + } }; void AddSC_boss_grandmaster_vorpil() diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index 4f1d93aa04e..99078b3b15d 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -64,7 +64,7 @@ public: SetCombatMovement(false); } - void Reset() + void Reset() OVERRIDE { events.ScheduleEvent(EVENT_SONIC_BOOM, 30000); events.ScheduleEvent(EVENT_MURMURS_TOUCH, urand(8000, 20000)); @@ -100,16 +100,16 @@ public: } } - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} // Sonic Boom instant damage (needs core fix instead of this) - void SpellHitTarget(Unit* target, const SpellInfo* spell) + void SpellHitTarget(Unit* target, const SpellInfo* spell) OVERRIDE { if (target && target->IsAlive() && spell && spell->Id == uint32(SPELL_SONIC_BOOM_EFFECT)) me->DealDamage(target, (target->GetHealth()*90)/100, NULL, SPELL_DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NATURE, spell); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target or casting if (!UpdateVictim() || me->IsNonMeleeSpellCasted(false)) @@ -188,12 +188,12 @@ public: DoMeleeAttackIfReady(); } - - CreatureAI* GetAI(Creature* creature) const - { - return new boss_murmurAI (creature); - } }; + + CreatureAI* GetAI(Creature* creature) const OVERRIDE + { + return new boss_murmurAI(creature); + } }; void AddSC_boss_murmur() diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp index e3dec9c0a45..6e579003262 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp @@ -39,7 +39,7 @@ class instance_shadow_labyrinth : public InstanceMapScript public: instance_shadow_labyrinth() : InstanceMapScript("instance_shadow_labyrinth", 555) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_shadow_labyrinth_InstanceMapScript(map); } @@ -111,7 +111,7 @@ public: } } - void SetData(uint32 type, uint32 uiData) + void SetData(uint32 type, uint32 uiData) OVERRIDE { switch (type) { @@ -174,7 +174,7 @@ public: } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -186,7 +186,7 @@ public: return false; } - uint64 GetData64(uint32 identifier) const + uint64 GetData64(uint32 identifier) const OVERRIDE { if (identifier == DATA_GRANDMASTERVORPIL) return m_uiGrandmasterVorpil; diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp index 329a8c73927..33a6c42bae7 100644 --- a/src/server/scripts/Outland/BlackTemple/black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/black_temple.cpp @@ -49,7 +49,7 @@ public: { npc_spirit_of_olumAI(Creature* creature) : ScriptedAI(creature) {} - void sGossipSelect(Player* player, uint32 /*sender*/, uint32 action) + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 action) OVERRIDE { if (action == 1) { @@ -60,7 +60,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_spirit_of_olumAI (creature); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp index d5db702a9fc..d55ca24914a 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp @@ -62,7 +62,7 @@ class boss_gurtogg_bloodboil : public CreatureScript public: boss_gurtogg_bloodboil() : CreatureScript("boss_gurtogg_bloodboil") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_gurtogg_bloodboilAI (creature); } @@ -93,7 +93,7 @@ public: bool Phase1; - void Reset() + void Reset() OVERRIDE { if (instance) instance->SetData(DATA_GURTOGGBLOODBOILEVENT, NOT_STARTED); @@ -119,7 +119,7 @@ public: me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, false); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); Talk(SAY_AGGRO); @@ -127,12 +127,12 @@ public: instance->SetData(DATA_GURTOGGBLOODBOILEVENT, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_GURTOGGBLOODBOILEVENT, DONE); @@ -196,7 +196,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 22322625775..07c6e665e98 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -383,14 +383,14 @@ public: { flame_of_azzinothAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { FlameBlastTimer = 15000; CheckTimer = 5000; GlaiveGUID = 0; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); } @@ -435,7 +435,7 @@ public: GlaiveGUID = guid; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -464,7 +464,7 @@ public: uint64 GlaiveGUID; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new flame_of_azzinothAI (creature); } @@ -484,11 +484,11 @@ public: DoCast(me, SPELL_DUAL_WIELD, true); } - void Reset(); + void Reset() OVERRIDE; - void JustSummoned(Creature* summon); + void JustSummoned(Creature* summon) OVERRIDE; - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { if (summon->GetCreatureTemplate()->Entry == FLAME_OF_AZZINOTH) { @@ -505,7 +505,7 @@ public: Summons.Despawn(summon); } - void MovementInform(uint32 /*MovementType*/, uint32 /*Data*/) + void MovementInform(uint32 /*MovementType*/, uint32 /*Data*/) OVERRIDE { if (FlightCount == 7) // change hover point { @@ -520,13 +520,13 @@ public: Timer[EVENT_FLIGHT_SEQUENCE] = 1000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { me->setActive(true); DoZoneInCombat(); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who || Phase >= PHASE_TALK_SEQUENCE) return; @@ -537,9 +537,10 @@ public: ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit*) {} + void MoveInLineOfSight(Unit*) OVERRIDE {} - void JustDied(Unit* /*killer*/) + + void JustDied(Unit* /*killer*/) OVERRIDE { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -552,7 +553,7 @@ public: instance->HandleGameObject(instance->GetData64(i), true); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -560,7 +561,7 @@ public: Talk(SAY_ILLIDAN_KILL); } - void DamageTaken(Unit* done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE { if (damage >= me->GetHealth() && done_by != me) damage = 0; @@ -568,7 +569,7 @@ public: done_by->AddThreat(me, -(3*(float)damage)/4); // do not let maiev tank him } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_GLAIVE_RETURNS) // Re-equip our warblades! { @@ -922,7 +923,7 @@ public: ++TransformCount; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if ((!UpdateVictim()) && Phase < PHASE_TALK_SEQUENCE) return; @@ -1126,7 +1127,7 @@ public: SummonList Summons; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_illidan_stormrageAI (creature); } @@ -1144,7 +1145,7 @@ public: { boss_maievAI(Creature* creature) : ScriptedAI(creature) {}; - void Reset() + void Reset() OVERRIDE { MaxTimer = 0; Phase = PHASE_NORMAL_MAIEV; @@ -1156,16 +1157,17 @@ public: me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 2, 45738); } - void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} - void EnterEvadeMode() {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + + void EnterEvadeMode() OVERRIDE {} void GetIllidanGUID(uint64 guid) { IllidanGUID = guid; } - void DamageTaken(Unit* done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE { if (done_by->GetGUID() != IllidanGUID) damage = 0; @@ -1179,7 +1181,7 @@ public: } } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who || Timer[EVENT_MAIEV_STEALTH]) return; @@ -1197,7 +1199,7 @@ public: ScriptedAI::AttackStart(who); } - void DoAction(int32 param) + void DoAction(int32 param) OVERRIDE { if (param > PHASE_ILLIDAN_NULL && param < PHASE_ILLIDAN_MAX) EnterPhase(PhaseIllidan(param)); @@ -1269,7 +1271,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if ((!UpdateVictim()) && !Timer[EVENT_MAIEV_STEALTH]) @@ -1346,7 +1348,7 @@ public: uint32 MaxTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_maievAI (creature); } @@ -1365,7 +1367,7 @@ public: JustCreated = true; } - void Reset() + void Reset() OVERRIDE { WalkCount = 0; if (instance) @@ -1421,23 +1423,24 @@ public: } // Do not call reset in Akama's evade mode, as this will stop him from summoning minions after he kills the first bit - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { me->RemoveAllAuras(); me->DeleteThreatList(); me->CombatStop(true); } - void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void MovementInform(uint32 MovementType, uint32 /*Data*/) + + void MovementInform(uint32 MovementType, uint32 /*Data*/) OVERRIDE { if (MovementType == POINT_MOTION_TYPE) Timer = 1; } - void DamageTaken(Unit* done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE { if (damage > me->GetHealth() || done_by->GetGUID() != IllidanGUID) damage = 0; @@ -1685,7 +1688,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!me->IsVisible()) { @@ -1768,7 +1771,7 @@ public: DoMeleeAttackIfReady(); } - void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) + void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) OVERRIDE { player->CLOSE_GOSSIP_MENU(); EnterPhase(PHASE_CHANNEL); @@ -1791,7 +1794,7 @@ public: uint32 Check_Timer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_akama_illidanAI(creature); } @@ -1985,7 +1988,7 @@ public: { cage_trap_triggerAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { IllidanGUID = 0; @@ -1997,9 +2000,10 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void EnterCombat(Unit* /*who*/){} + void EnterCombat(Unit* /*who*/)OVERRIDE {} + + void MoveInLineOfSight(Unit* who) OVERRIDE - void MoveInLineOfSight(Unit* who) { if (!Active) return; @@ -2023,7 +2027,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (DespawnTimer) { @@ -2049,7 +2053,7 @@ public: bool SummonedBeams; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new cage_trap_triggerAI (creature); } @@ -2060,7 +2064,7 @@ class gameobject_cage_trap : public GameObjectScript public: gameobject_cage_trap() : GameObjectScript("gameobject_cage_trap") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { float x, y, z; player->GetPosition(x, y, z); @@ -2082,24 +2086,24 @@ public: { shadow_demonAI(Creature* creature) : ScriptedAI(creature) {} - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); } - void Reset() + void Reset() OVERRIDE { TargetGUID = 0; DoCast(me, SPELL_SHADOW_DEMON_PASSIVE, true); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Unit* target = Unit::GetUnit(*me, TargetGUID)) target->RemoveAurasDueToSpell(SPELL_PARALYZE); } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!UpdateVictim()) return; @@ -2123,7 +2127,7 @@ public: uint64 TargetGUID; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new shadow_demonAI (creature); } @@ -2138,14 +2142,14 @@ public: { blade_of_azzinothAI(Creature* creature) : NullCreatureAI(creature) {} - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_THROW_GLAIVE2 || spell->Id == SPELL_THROW_GLAIVE) me->SetDisplayId(MODEL_BLADE);// appear when hit by Illidan's glaive } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new blade_of_azzinothAI (creature); } @@ -2164,7 +2168,7 @@ public: instance = creature->GetInstanceScript(); } - void Reset() + void Reset() OVERRIDE { if (instance) IllidanGUID = instance->GetData64(DATA_ILLIDANSTORMRAGE); @@ -2175,7 +2179,7 @@ public: DoCast(me, SPELL_SHADOWFIEND_PASSIVE, true); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); } @@ -2196,7 +2200,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!me->GetVictim()) { @@ -2230,7 +2234,7 @@ public: uint32 CheckTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_parasitic_shadowfiendAI (creature); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index 1695c729b86..0bf6685bcf4 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -82,7 +82,7 @@ class boss_mother_shahraz : public CreatureScript public: boss_mother_shahraz() : CreatureScript("boss_mother_shahraz") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_shahrazAI (creature); } @@ -111,7 +111,7 @@ public: bool Enraged; - void Reset() + void Reset() OVERRIDE { if (instance) instance->SetData(DATA_MOTHERSHAHRAZEVENT, NOT_STARTED); @@ -134,7 +134,7 @@ public: Enraged = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) instance->SetData(DATA_MOTHERSHAHRAZEVENT, IN_PROGRESS); @@ -143,12 +143,12 @@ public: Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_MOTHERSHAHRAZEVENT, DONE); @@ -174,7 +174,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index c2d2c67dc48..e43b80d375d 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -104,7 +104,7 @@ class npc_enslaved_soul : public CreatureScript public: npc_enslaved_soul() : CreatureScript("npc_enslaved_soul") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_enslaved_soulAI (creature); } @@ -115,15 +115,15 @@ public: uint64 ReliquaryGUID; - void Reset() {ReliquaryGUID = 0;} + void Reset() OVERRIDE { ReliquaryGUID = 0; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoCast(me, ENSLAVED_SOUL_PASSIVE, true); DoZoneInCombat(); } - void JustDied(Unit* /*killer*/); + void JustDied(Unit* /*killer*/) OVERRIDE; }; }; @@ -132,7 +132,7 @@ class boss_reliquary_of_souls : public CreatureScript public: boss_reliquary_of_souls() : CreatureScript("boss_reliquary_of_souls") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_reliquary_of_soulsAI (creature); } @@ -156,7 +156,7 @@ public: uint32 SoulCount; uint32 SoulDeathCount; - void Reset() + void Reset() OVERRIDE { if (instance) instance->SetData(DATA_RELIQUARYOFSOULSEVENT, NOT_STARTED); @@ -177,7 +177,8 @@ public: me->RemoveAurasDueToSpell(SPELL_SUBMERGE); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!who) return; @@ -194,7 +195,7 @@ public: AttackStartNoMove(who); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { me->AddThreat(who, 10000.0f); DoZoneInCombat(); @@ -242,13 +243,13 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_RELIQUARYOFSOULSEVENT, DONE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!Phase) return; @@ -387,7 +388,7 @@ class boss_essence_of_suffering : public CreatureScript public: boss_essence_of_suffering() : CreatureScript("boss_essence_of_suffering") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_essence_of_sufferingAI (creature); } @@ -404,7 +405,7 @@ public: uint32 SoulDrainTimer; uint32 AuraTimer; - void Reset() + void Reset() OVERRIDE { StatAuraGUID = 0; @@ -415,7 +416,7 @@ public: AuraTimer = 5000; } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { if (damage >= me->GetHealth()) { @@ -427,7 +428,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (!me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE)) { @@ -440,7 +441,7 @@ public: else return; } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SUFF_SAY_SLAY); } @@ -469,7 +470,7 @@ public: me->AddThreat(target, 1000000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (me->IsInCombat()) { @@ -512,7 +513,7 @@ class boss_essence_of_desire : public CreatureScript public: boss_essence_of_desire() : CreatureScript("boss_essence_of_desire") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_essence_of_desireAI (creature); } @@ -525,7 +526,7 @@ public: uint32 DeadenTimer; uint32 SoulShockTimer; - void Reset() + void Reset() OVERRIDE { RuneShieldTimer = 60000; DeadenTimer = 30000; @@ -533,7 +534,7 @@ public: me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_CONFUSE, true); } - void DamageTaken(Unit* done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE { if (done_by == me) return; @@ -552,7 +553,7 @@ public: } } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE { if (me->GetCurrentSpell(CURRENT_GENERIC_SPELL)) for (uint8 i = 0; i < 3; ++i) @@ -562,19 +563,19 @@ public: me->InterruptSpell(CURRENT_GENERIC_SPELL, false); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(DESI_SAY_FREED); DoZoneInCombat(); DoCast(me, AURA_OF_DESIRE, true); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(DESI_SAY_SLAY); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -615,7 +616,7 @@ class boss_essence_of_anger : public CreatureScript public: boss_essence_of_anger() : CreatureScript("boss_essence_of_anger") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_essence_of_angerAI (creature); } @@ -634,7 +635,7 @@ public: bool CheckedAggro; - void Reset() + void Reset() OVERRIDE { AggroTargetGUID = 0; @@ -647,7 +648,7 @@ public: CheckedAggro = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(ANGER_SAY_FREED); @@ -655,17 +656,17 @@ public: DoCast(me, AURA_OF_ANGER, true); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(ANGER_SAY_DEATH); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(ANGER_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/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index a4779204571..04e08a517e7 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -125,7 +125,7 @@ class npc_ashtongue_channeler : public CreatureScript public: npc_ashtongue_channeler() : CreatureScript("npc_ashtongue_channeler") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ashtongue_channelerAI (creature); } @@ -139,12 +139,13 @@ public: uint64 ShadeGUID; - void Reset() {} - void JustDied(Unit* /*killer*/); - void EnterCombat(Unit* /*who*/) {} - void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(uint32 /*diff*/) {} + void Reset() OVERRIDE {} + void JustDied(Unit* /*killer*/) OVERRIDE; + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void AttackStart(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + + void UpdateAI(uint32 /*diff*/) OVERRIDE {} }; }; @@ -154,7 +155,7 @@ class npc_ashtongue_sorcerer : public CreatureScript public: npc_ashtongue_sorcerer() : CreatureScript("npc_ashtongue_sorcerer") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ashtongue_sorcererAI (creature); } @@ -170,17 +171,18 @@ public: uint32 CheckTimer; bool StartBanishing; - void Reset() + void Reset() OVERRIDE { StartBanishing = false; CheckTimer = 5000; } - void JustDied(Unit* /*killer*/); - void EnterCombat(Unit* /*who*/) {} - void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(uint32 diff) + void JustDied(Unit* /*killer*/) OVERRIDE; + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void AttackStart(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + + void UpdateAI(uint32 diff) OVERRIDE { if (StartBanishing) return; @@ -212,7 +214,7 @@ class boss_shade_of_akama : public CreatureScript public: boss_shade_of_akama() : CreatureScript("boss_shade_of_akama") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_shade_of_akamaAI (creature); } @@ -249,7 +251,7 @@ public: bool HasKilledAkamaAndReseting; SummonList summons; - void Reset() + void Reset() OVERRIDE { reseting = true; HasKilledAkamaAndReseting = false; @@ -292,24 +294,25 @@ public: reseting = false; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { summons.DespawnAll(); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { if (summon->GetEntry() == NPC_DEFENDER || summon->GetEntry() == 23523 || summon->GetEntry() == 23318 || summon->GetEntry() == 23524) summons.Summon(summon); } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { if (summon->GetEntry() == NPC_DEFENDER || summon->GetEntry() == 23523 || summon->GetEntry() == 23318 || summon->GetEntry() == 23524) summons.Despawn(summon); } - void MoveInLineOfSight(Unit* /*who*/) + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE + { if (!GridSearcherSucceeded) { @@ -340,7 +343,7 @@ public: } } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who || IsBanished) return; @@ -433,7 +436,7 @@ public: void SetAkamaGUID(uint64 guid) { AkamaGUID = guid; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!me->IsInCombat()) return; @@ -564,7 +567,7 @@ class npc_akama_shade : public CreatureScript public: npc_akama_shade() : CreatureScript("npc_akama_shade") { } - 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) //Fight time @@ -576,7 +579,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->IsAlive()) { @@ -587,7 +590,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_akamaAI (creature); } @@ -637,7 +640,7 @@ public: bool HasYelledOnce; SummonList summons; - void Reset() + void Reset() OVERRIDE { DestructivePoisonTimer = 15000; LightningBoltTimer = 10000; @@ -651,19 +654,19 @@ public: summons.DespawnAll(); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { if (summon->GetEntry() == NPC_BROKEN) summons.Summon(summon); } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { if (summon->GetEntry() == NPC_BROKEN) summons.Despawn(summon); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} void BeginEvent(Player* player) { @@ -693,7 +696,7 @@ public: } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -716,7 +719,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); EventBegun = false; @@ -736,7 +739,7 @@ public: summons.DespawnAll(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!EventBegun) return; diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index e1da7882b70..806d11a3906 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -63,7 +63,7 @@ class molten_flame : public CreatureScript public: molten_flame() : CreatureScript("molten_flame") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new molten_flameAI (creature); } @@ -72,7 +72,7 @@ public: { molten_flameAI(Creature* creature) : NullCreatureAI(creature) {} - void InitializeAI() + void InitializeAI() OVERRIDE { float x, y, z; me->GetNearPoint(me, x, y, z, 1, 100, float(M_PI*2*rand_norm())); @@ -88,7 +88,7 @@ class boss_supremus : public CreatureScript public: boss_supremus() : CreatureScript("boss_supremus") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_supremusAI (creature); } @@ -105,7 +105,7 @@ public: SummonList summons; uint32 phase; - void Reset() + void Reset() OVERRIDE { if (instance) { @@ -123,7 +123,7 @@ public: summons.DespawnAll(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) instance->SetData(DATA_SUPREMUSEVENT, IN_PROGRESS); @@ -160,7 +160,7 @@ public: events.ScheduleEvent(EVENT_SWITCH_PHASE, 60000, GCD_CAST); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -170,12 +170,12 @@ public: summons.DespawnAll(); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { summons.Summon(summon); } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { summons.Despawn(summon); } @@ -203,7 +203,7 @@ public: return target; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -267,7 +267,7 @@ class npc_volcano : public CreatureScript public: npc_volcano() : CreatureScript("npc_volcano") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_volcanoAI (creature); } @@ -279,7 +279,7 @@ public: SetCombatMovement(false); } - void Reset() + void Reset() OVERRIDE { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -289,16 +289,17 @@ public: } uint32 wait; - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void DoAction(int32 /*info*/) + + void DoAction(int32 /*info*/) OVERRIDE { me->RemoveAura(SPELL_VOLCANIC_ERUPTION); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (wait <= diff)//wait 3secs before casting { diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index 14a31e85e24..dc212e69d87 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -56,7 +56,7 @@ class npc_doom_blossom : public CreatureScript public: npc_doom_blossom() : CreatureScript("npc_doom_blossom") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_doom_blossomAI(creature); } @@ -69,16 +69,17 @@ public: uint32 ShadowBoltTimer; uint64 TeronGUID; - void Reset() + void Reset() OVERRIDE { CheckTeronTimer = 5000; ShadowBoltTimer = 12000; TeronGUID = 0; } - void EnterCombat(Unit* /*who*/) { } - void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void AttackStart(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void Despawn() { @@ -86,7 +87,7 @@ public: me->RemoveCorpse(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (CheckTeronTimer <= diff) { @@ -124,7 +125,7 @@ class npc_shadowy_construct : public CreatureScript public: npc_shadowy_construct() : CreatureScript("npc_shadowy_construct") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_shadowy_constructAI(creature); } @@ -139,7 +140,7 @@ public: uint32 CheckPlayerTimer; uint32 CheckTeronTimer; - void Reset() + void Reset() OVERRIDE { GhostGUID = 0; TeronGUID = 0; @@ -148,9 +149,10 @@ public: CheckTeronTimer = 5000; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void MoveInLineOfSight(Unit* who) OVERRIDE - void MoveInLineOfSight(Unit* who) { if (!who || (!who->IsAlive()) || (who->GetGUID() == GhostGUID)) return; @@ -159,7 +161,7 @@ public: } /* Comment it out for now. NOTE TO FUTURE DEV: UNCOMMENT THIS OUT ONLY AFTER MIND CONTROL IS IMPLEMENTED - void DamageTaken(Unit* done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE { if (done_by->GetGUID() != GhostGUID) damage = 0; // Only the ghost can deal damage. @@ -188,7 +190,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (CheckPlayerTimer <= diff) { @@ -213,7 +215,7 @@ class boss_teron_gorefiend : public CreatureScript public: boss_teron_gorefiend() : CreatureScript("boss_teron_gorefiend") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_teron_gorefiendAI (creature); } @@ -242,7 +244,7 @@ public: bool Intro; bool Done; - void Reset() + void Reset() OVERRIDE { if (instance) instance->SetData(DATA_TERONGOREFIENDEVENT, NOT_STARTED); @@ -264,9 +266,10 @@ public: Done = false; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void MoveInLineOfSight(Unit* who) OVERRIDE - void MoveInLineOfSight(Unit* who) { if (!Intro && who->GetTypeId() == TYPEID_PLAYER && me->CanCreatureAttack(who)) { @@ -287,12 +290,12 @@ public: ScriptedAI::MoveInLineOfSight(who); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_TERONGOREFIENDEVENT, DONE); @@ -378,7 +381,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (Intro && !Done) { diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index 2782892db5d..e70acb40556 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -76,7 +76,7 @@ class boss_najentus : public CreatureScript public: boss_najentus() : CreatureScript("boss_najentus") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_najentusAI (creature); } @@ -93,7 +93,7 @@ public: uint64 SpineTargetGUID; - void Reset() + void Reset() OVERRIDE { events.Reset(); @@ -103,13 +103,13 @@ public: instance->SetData(DATA_HIGHWARLORDNAJENTUSEVENT, NOT_STARTED); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); events.DelayEvents(5000, GCD_YELL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_HIGHWARLORDNAJENTUSEVENT, DONE); @@ -117,7 +117,7 @@ public: Talk(SAY_DEATH); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_HURL_SPINE && me->HasAura(SPELL_TIDAL_SHIELD)) { @@ -127,7 +127,7 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) instance->SetData(DATA_HIGHWARLORDNAJENTUSEVENT, IN_PROGRESS); @@ -158,7 +158,7 @@ public: events.RescheduleEvent(EVENT_SHIELD, 60000 + inc); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -225,7 +225,7 @@ class go_najentus_spine : public GameObjectScript public: go_najentus_spine() : GameObjectScript("go_najentus_spine") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (InstanceScript* instance = go->GetInstanceScript()) if (Creature* Najentus = Unit::GetCreature(*go, instance->GetData64(DATA_HIGHWARLORDNAJENTUS))) diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index bbf75b2df5c..8b135316704 100644 --- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp @@ -120,7 +120,7 @@ class npc_blood_elf_council_voice_trigger : public CreatureScript public: npc_blood_elf_council_voice_trigger() : CreatureScript("npc_blood_elf_council_voice_trigger") { } - CreatureAI* GetAI(Creature* c) const + CreatureAI* GetAI(Creature* c) const OVERRIDE { return new npc_blood_elf_council_voice_triggerAI(c); } @@ -142,7 +142,7 @@ public: bool EventStarted; - void Reset() + void Reset() OVERRIDE { EnrageTimer = 900000; // 15 minutes AggroYellTimer = 500; @@ -164,12 +164,13 @@ public: } else TC_LOG_ERROR(LOG_FILTER_TSCR, ERROR_INST_DATA); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + + void UpdateAI(uint32 diff) OVERRIDE { if (!EventStarted) return; @@ -215,7 +216,7 @@ class npc_illidari_council : public CreatureScript public: npc_illidari_council() : CreatureScript("npc_illidari_council") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_illidari_councilAI (creature); } @@ -240,7 +241,7 @@ public: bool EventBegun; - void Reset() + void Reset() OVERRIDE { CheckTimer = 2000; EndEventTimer = 0; @@ -276,9 +277,10 @@ public: me->SetDisplayId(11686); } - void EnterCombat(Unit* /*who*/) {} - void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void AttackStart(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + void StartEvent(Unit* target) { @@ -315,7 +317,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!EventBegun) return; @@ -397,7 +399,7 @@ struct boss_illidari_councilAI : public ScriptedAI bool LoadedGUIDs; - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (instance) { @@ -420,7 +422,7 @@ struct boss_illidari_councilAI : public ScriptedAI LoadGUIDs(); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { for (uint8 i = 0; i < 4; ++i) { @@ -434,7 +436,7 @@ struct boss_illidari_councilAI : public ScriptedAI ScriptedAI::EnterEvadeMode(); } - void DamageTaken(Unit* done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE { if (done_by == me) return; @@ -473,7 +475,7 @@ class boss_gathios_the_shatterer : public CreatureScript public: boss_gathios_the_shatterer() : CreatureScript("boss_gathios_the_shatterer") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_gathios_the_shattererAI (creature); } @@ -488,7 +490,7 @@ public: uint32 AuraTimer; uint32 BlessingTimer; - void Reset() + void Reset() OVERRIDE { ConsecrationTimer = 40000; HammerOfJusticeTimer = 10000; @@ -497,12 +499,12 @@ public: BlessingTimer = 60000; } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_GATH_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_GATH_DEATH); } @@ -536,7 +538,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -605,7 +607,7 @@ class boss_high_nethermancer_zerevor : public CreatureScript public: boss_high_nethermancer_zerevor() : CreatureScript("boss_high_nethermancer_zerevor") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_high_nethermancer_zerevorAI (creature); } @@ -621,7 +623,7 @@ public: uint32 Cooldown; uint32 ArcaneExplosionTimer; - void Reset() + void Reset() OVERRIDE { BlizzardTimer = urand(30, 91) * 1000; FlamestrikeTimer = urand(30, 91) * 1000; @@ -631,17 +633,17 @@ public: Cooldown = 0; } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_ZERE_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_ZERE_DEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -709,7 +711,7 @@ class boss_lady_malande : public CreatureScript public: boss_lady_malande() : CreatureScript("boss_lady_malande") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_lady_malandeAI (creature); } @@ -723,7 +725,7 @@ public: uint32 DivineWrathTimer; uint32 ReflectiveShieldTimer; - void Reset() + void Reset() OVERRIDE { EmpoweredSmiteTimer = 38000; CircleOfHealingTimer = 20000; @@ -731,17 +733,17 @@ public: ReflectiveShieldTimer = 0; } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_MALA_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_MALA_DEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -787,7 +789,7 @@ class boss_veras_darkshadow : public CreatureScript public: boss_veras_darkshadow() : CreatureScript("boss_veras_darkshadow") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_veras_darkshadowAI (creature); } @@ -804,7 +806,7 @@ public: bool HasVanished; - void Reset() + void Reset() OVERRIDE { EnvenomTargetGUID = 0; @@ -817,17 +819,17 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_VERA_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_VERA_DEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -901,7 +903,7 @@ public: { PrepareAuraScript(spell_boss_lady_malande_shield_AuraScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { return sSpellMgr->GetSpellInfo(SPELL_REFLECTIVE_SHIELD_T); } @@ -915,13 +917,13 @@ public: target->CastCustomSpell(dmgInfo.GetAttacker(), SPELL_REFLECTIVE_SHIELD_T, &bp, NULL, NULL, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { AfterEffectAbsorb += AuraEffectAbsorbFn(spell_boss_lady_malande_shield_AuraScript::Trigger, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_boss_lady_malande_shield_AuraScript(); } diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp index 97247f1b7a6..60092689cc0 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -47,7 +47,7 @@ class instance_black_temple : public InstanceMapScript public: instance_black_temple() : InstanceMapScript("instance_black_temple", 564) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_black_temple_InstanceMapScript(map); } @@ -238,7 +238,7 @@ public: } } - uint64 GetData64(uint32 identifier) const + uint64 GetData64(uint32 identifier) const OVERRIDE { switch (identifier) { @@ -264,7 +264,7 @@ public: return 0; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -348,7 +348,7 @@ public: } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp index d25b9a25a85..545dbed7975 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -102,7 +102,7 @@ class boss_fathomlord_karathress : public CreatureScript public: boss_fathomlord_karathress() : CreatureScript("boss_fathomlord_karathress") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_fathomlord_karathressAI (creature); } @@ -127,7 +127,7 @@ public: uint64 Advisors[MAX_ADVISORS]; - void Reset() + void Reset() OVERRIDE { CataclysmicBolt_Timer = 10000; Enrage_Timer = 600000; //10 minutes @@ -201,12 +201,12 @@ public: instance->SetData(DATA_KARATHRESSEVENT, 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); @@ -217,12 +217,12 @@ public: me->SummonCreature(SEER_OLUM, OLUM_X, OLUM_Y, OLUM_Z, OLUM_O, TEMPSUMMON_TIMED_DESPAWN, 3600000); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { StartEvent(who); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Only if not incombat check if the event is started if (!me->IsInCombat() && instance && instance->GetData(DATA_KARATHRESSEVENT)) @@ -310,7 +310,7 @@ class boss_fathomguard_sharkkis : public CreatureScript public: boss_fathomguard_sharkkis() : CreatureScript("boss_fathomguard_sharkkis") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_fathomguard_sharkkisAI (creature); } @@ -333,7 +333,7 @@ public: uint64 SummonedPet; - void Reset() + void Reset() OVERRIDE { LeechingThrow_Timer = 20000; TheBeastWithin_Timer = 30000; @@ -354,7 +354,7 @@ public: instance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -363,7 +363,7 @@ public: } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (instance) { @@ -372,7 +372,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Only if not incombat check if the event is started if (!me->IsInCombat() && instance && instance->GetData(DATA_KARATHRESSEVENT)) @@ -457,7 +457,7 @@ class boss_fathomguard_tidalvess : public CreatureScript public: boss_fathomguard_tidalvess() : CreatureScript("boss_fathomguard_tidalvess") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_fathomguard_tidalvessAI (creature); } @@ -476,7 +476,7 @@ public: uint32 PoisonCleansing_Timer; uint32 Earthbind_Timer; - void Reset() + void Reset() OVERRIDE { FrostShock_Timer = 25000; Spitfire_Timer = 60000; @@ -487,7 +487,7 @@ public: instance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -496,7 +496,7 @@ public: } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (instance) { @@ -506,7 +506,7 @@ public: DoCast(me, SPELL_WINDFURY_WEAPON); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Only if not incombat check if the event is started if (!me->IsInCombat() && instance && instance->GetData(DATA_KARATHRESSEVENT)) @@ -580,7 +580,7 @@ class boss_fathomguard_caribdis : public CreatureScript public: boss_fathomguard_caribdis() : CreatureScript("boss_fathomguard_caribdis") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_fathomguard_caribdisAI (creature); } @@ -599,7 +599,7 @@ public: uint32 Heal_Timer; uint32 Cyclone_Timer; - void Reset() + void Reset() OVERRIDE { WaterBoltVolley_Timer = 35000; TidalSurge_Timer = 15000+rand()%5000; @@ -610,7 +610,7 @@ public: instance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -619,7 +619,7 @@ public: } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (instance) { @@ -628,7 +628,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Only if not incombat check if the event is started if (!me->IsInCombat() && instance && instance->GetData(DATA_KARATHRESSEVENT)) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp index 3b19393fa44..c96c0e0f269 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -84,7 +84,7 @@ class boss_hydross_the_unstable : public CreatureScript public: boss_hydross_the_unstable() : CreatureScript("boss_hydross_the_unstable") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_hydross_the_unstableAI (creature); } @@ -111,7 +111,7 @@ public: bool beam; SummonList Summons; - void Reset() + void Reset() OVERRIDE { DeSummonBeams(); beams[0] = 0; @@ -169,7 +169,7 @@ public: } } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -177,12 +177,12 @@ public: instance->SetData(DATA_HYDROSSTHEUNSTABLEEVENT, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(CorruptedForm ? SAY_CORRUPT_SLAY : SAY_CLEAN_SLAY); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned->GetEntry() == ENTRY_PURE_SPAWN) { @@ -198,12 +198,12 @@ public: } } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { Summons.Despawn(summon); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(CorruptedForm ? SAY_CORRUPT_DEATH : SAY_CLEAN_DEATH); @@ -212,7 +212,7 @@ public: Summons.DespawnAll(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!beam) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index 7e168f8bf90..978a8fe6356 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -138,7 +138,7 @@ class boss_lady_vashj : public CreatureScript public: boss_lady_vashj() : CreatureScript("boss_lady_vashj") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_lady_vashjAI (creature); } @@ -177,7 +177,7 @@ public: bool CanAttack; bool JustCreated; - void Reset() + void Reset() OVERRIDE { AggroTimer = 19000; ShockBlastTimer = 1+rand()%60000; @@ -223,12 +223,12 @@ public: if (TaintedElementalTimer > 50000) TaintedElementalTimer = 50000; } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -246,7 +246,7 @@ public: instance->SetData(DATA_LADYVASHJEVENT, IN_PROGRESS); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (instance) { @@ -263,7 +263,8 @@ public: AttackStart(who); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!Intro) { @@ -310,7 +311,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!CanAttack && Intro) { @@ -548,7 +549,7 @@ class npc_enchanted_elemental : public CreatureScript public: npc_enchanted_elemental() : CreatureScript("npc_enchanted_elemental") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_enchanted_elementalAI (creature); } @@ -567,7 +568,7 @@ public: uint64 VashjGUID; - void Reset() + void Reset() OVERRIDE { me->SetSpeed(MOVE_WALK, 0.6f); // walk me->SetSpeed(MOVE_RUN, 0.6f); // run @@ -595,11 +596,12 @@ public: VashjGUID = instance->GetData64(DATA_LADYVASHJ); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void MoveInLineOfSight(Unit* /*who*/) {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!instance) return; @@ -642,7 +644,7 @@ class npc_tainted_elemental : public CreatureScript public: npc_tainted_elemental() : CreatureScript("npc_tainted_elemental") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_tainted_elementalAI (creature); } @@ -659,25 +661,25 @@ public: uint32 PoisonBoltTimer; uint32 DespawnTimer; - void Reset() + void Reset() OVERRIDE { PoisonBoltTimer = 5000+rand()%5000; DespawnTimer = 30000; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) if (Creature* vashj = Unit::GetCreature((*me), instance->GetData64(DATA_LADYVASHJ))) CAST_AI(boss_lady_vashj::boss_lady_vashjAI, vashj->AI())->EventTaintedElementalDeath(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { me->AddThreat(who, 0.1f); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { // PoisonBoltTimer if (PoisonBoltTimer <= diff) @@ -711,7 +713,7 @@ class npc_toxic_sporebat : public CreatureScript public: npc_toxic_sporebat() : CreatureScript("npc_toxic_sporebat") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_toxic_sporebatAI (creature); } @@ -731,7 +733,7 @@ public: uint32 BoltTimer; uint32 CheckTimer; - void Reset() + void Reset() OVERRIDE { me->SetDisableGravity(true); me->setFaction(14); @@ -741,11 +743,12 @@ public: CheckTimer = 1000; } - void MoveInLineOfSight(Unit* /*who*/) + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE + { } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -754,7 +757,7 @@ public: MovementTimer = 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { // Random movement if (MovementTimer <= diff) @@ -809,7 +812,7 @@ class npc_shield_generator_channel : public CreatureScript public: npc_shield_generator_channel() : CreatureScript("npc_shield_generator_channel") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_shield_generator_channelAI (creature); } @@ -825,7 +828,7 @@ public: uint32 CheckTimer; bool Casted; - void Reset() + void Reset() OVERRIDE { CheckTimer = 0; Casted = false; @@ -834,9 +837,10 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } - void MoveInLineOfSight(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!instance) return; @@ -866,7 +870,7 @@ class item_tainted_core : public ItemScript public: item_tainted_core() : ItemScript("item_tainted_core") { } - bool OnUse(Player* player, Item* /*item*/, SpellCastTargets const& targets) + bool OnUse(Player* player, Item* /*item*/, SpellCastTargets const& targets) OVERRIDE { InstanceScript* instance = player->GetInstanceScript(); if (!instance) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index 733ccf64101..b477d020d6a 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -74,7 +74,7 @@ class npc_inner_demon : public CreatureScript public: npc_inner_demon() : CreatureScript("npc_inner_demon") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_inner_demonAI (creature); } @@ -91,33 +91,33 @@ public: uint32 Link_Timer; uint64 victimGUID; - void Reset() + void Reset() OVERRIDE { ShadowBolt_Timer = 10000; Link_Timer = 1000; } - void SetGUID(uint64 guid, int32 id/* = 0 */) + void SetGUID(uint64 guid, int32 id/* = 0 */) OVERRIDE { if (id == INNER_DEMON_VICTIM) victimGUID = guid; } - uint64 GetGUID(int32 id/* = 0 */) const + uint64 GetGUID(int32 id/* = 0 */) const OVERRIDE { if (id == INNER_DEMON_VICTIM) return victimGUID; return 0; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Unit* unit = Unit::GetUnit(*me, victimGUID); if (unit && unit->HasAura(SPELL_INSIDIOUS_WHISPER)) unit->RemoveAurasDueToSpell(SPELL_INSIDIOUS_WHISPER); } - void DamageTaken(Unit* done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE { if (done_by->GetGUID() != victimGUID && done_by->GetGUID() != me->GetGUID()) { @@ -126,13 +126,13 @@ public: } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (!victimGUID) return; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -179,7 +179,7 @@ class boss_leotheras_the_blind : public CreatureScript public: boss_leotheras_the_blind() : CreatureScript("boss_leotheras_the_blind") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_leotheras_the_blindAI (creature); } @@ -218,7 +218,7 @@ public: uint64 Demon; uint64 SpellBinderGUID[3]; - void Reset() + void Reset() OVERRIDE { CheckChannelers(); BanishTimer = 1000; @@ -264,7 +264,8 @@ public: SpellBinderGUID[i] = binder->GetGUID(); } } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (me->HasAura(AURA_BANISH)) return; @@ -383,7 +384,7 @@ public: } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -391,7 +392,7 @@ public: Talk(DemonForm ? SAY_DEMON_SLAY : SAY_NIGHTELF_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -405,7 +406,7 @@ public: instance->SetData(DATA_LEOTHERASTHEBLINDEVENT, DONE); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (me->HasAura(AURA_BANISH)) return; @@ -413,7 +414,7 @@ public: me->LoadEquipment(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (me->HasAura(AURA_BANISH) || !UpdateVictim()) @@ -601,7 +602,7 @@ class boss_leotheras_the_blind_demonform : public CreatureScript public: boss_leotheras_the_blind_demonform() : CreatureScript("boss_leotheras_the_blind_demonform") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_leotheras_the_blind_demonformAI (creature); } @@ -613,7 +614,7 @@ public: uint32 ChaosBlast_Timer; bool DealDamage; - void Reset() + void Reset() OVERRIDE { ChaosBlast_Timer = 1000; DealDamage = true; @@ -624,7 +625,7 @@ public: Talk(SAY_FREE); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() != TYPEID_PLAYER) return; @@ -632,18 +633,18 @@ public: Talk(SAY_DEMON_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { //invisibility (blizzlike, at the end of the fight he doesn't die, he disappears) DoCast(me, 8149, true); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { StartEvent(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -674,7 +675,7 @@ class npc_greyheart_spellbinder : public CreatureScript public: npc_greyheart_spellbinder() : CreatureScript("npc_greyheart_spellbinder") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_greyheart_spellbinderAI (creature); } @@ -697,7 +698,7 @@ public: bool AddedBanish; - void Reset() + void Reset() OVERRIDE { Mindblast_Timer = urand(3000, 8000); Earthshock_Timer = urand(5000, 10000); @@ -711,14 +712,14 @@ public: } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { me->InterruptNonMeleeSpells(false); if (instance) instance->SetData64(DATA_LEOTHERAS_EVENT_STARTER, who->GetGUID()); } - void JustRespawned() + void JustRespawned() OVERRIDE { AddedBanish = false; Reset(); @@ -737,7 +738,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (instance) { @@ -800,7 +801,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) {} + void JustDied(Unit* /*killer*/) OVERRIDE {} }; }; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index 2cc306c5df1..e3a7c379414 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -79,7 +79,7 @@ class boss_the_lurker_below : public CreatureScript public: boss_the_lurker_below() : CreatureScript("boss_the_lurker_below") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_the_lurker_belowAI (creature); } @@ -116,7 +116,7 @@ public: return false; return true; } - void Reset() + void Reset() OVERRIDE { me->SetSwim(true); me->SetDisableGravity(true); @@ -149,7 +149,7 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -160,13 +160,14 @@ public: Summons.DespawnAll(); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) instance->SetData(DATA_THELURKERBELOWEVENT, IN_PROGRESS); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!CanStartEvent) // boss is invisible, don't attack return; @@ -178,13 +179,13 @@ public: } } - void MovementInform(uint32 type, uint32 /*id*/) + void MovementInform(uint32 type, uint32 /*id*/) OVERRIDE { if (type == ROTATE_MOTION_TYPE) me->SetReactState(REACT_AGGRESSIVE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!CanStartEvent) // boss is invisible, don't attack { @@ -370,7 +371,7 @@ class npc_coilfang_ambusher : public CreatureScript public: npc_coilfang_ambusher() : CreatureScript("npc_coilfang_ambusher") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_coilfang_ambusherAI (creature); } @@ -385,13 +386,14 @@ public: uint32 MultiShotTimer; uint32 ShootBowTimer; - void Reset() + void Reset() OVERRIDE { MultiShotTimer = 10000; ShootBowTimer = 4000; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!who || me->GetVictim()) return; @@ -400,7 +402,7 @@ public: AttackStart(who); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (MultiShotTimer <= diff) { @@ -429,7 +431,7 @@ class go_strange_pool : public GameObjectScript public: go_strange_pool() : GameObjectScript("go_strange_pool") {} - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { // 25% if (InstanceScript* instanceScript = go->GetInstanceScript()) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index 448492dd134..b0c6305abf1 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -89,7 +89,7 @@ class boss_morogrim_tidewalker : public CreatureScript public: boss_morogrim_tidewalker() : CreatureScript("boss_morogrim_tidewalker") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_morogrim_tidewalkerAI (creature); } @@ -116,7 +116,7 @@ public: bool Earthquake; bool Phase2; - void Reset() + void Reset() OVERRIDE { TidalWave_Timer = 10000; WateryGrave_Timer = 30000; @@ -142,12 +142,12 @@ public: instance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, 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); @@ -155,7 +155,7 @@ public: instance->SetData(DATA_MOROGRIMTIDEWALKEREVENT, DONE); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { PlayerList = &me->GetMap()->GetPlayers(); Playercount = PlayerList->getSize(); @@ -173,7 +173,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -292,7 +292,7 @@ class npc_water_globule : public CreatureScript public: npc_water_globule() : CreatureScript("npc_water_globule") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_water_globuleAI (creature); } @@ -303,7 +303,7 @@ public: uint32 Check_Timer; - void Reset() + void Reset() OVERRIDE { Check_Timer = 1000; @@ -312,9 +312,10 @@ public: me->setFaction(14); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void MoveInLineOfSight(Unit* who) OVERRIDE - void MoveInLineOfSight(Unit* who) { if (!who || me->GetVictim()) return; @@ -327,7 +328,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/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp index b45029eb2bd..79e89740b2d 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -64,7 +64,7 @@ class go_bridge_console : public GameObjectScript public: go_bridge_console() : GameObjectScript("go_bridge_console") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE { InstanceScript* instance = go->GetInstanceScript(); @@ -246,7 +246,7 @@ class instance_serpent_shrine : public InstanceMapScript } } - void SetData64(uint32 type, uint64 data) + void SetData64(uint32 type, uint64 data) OVERRIDE { if (type == DATA_KARATHRESSEVENT_STARTER) KarathressEvent_Starter = data; @@ -254,7 +254,7 @@ class instance_serpent_shrine : public InstanceMapScript LeotherasEventStarter = data; } - uint64 GetData64(uint32 identifier) const + uint64 GetData64(uint32 identifier) const OVERRIDE { switch (identifier) { @@ -282,7 +282,7 @@ class instance_serpent_shrine : public InstanceMapScript return 0; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -352,7 +352,7 @@ class instance_serpent_shrine : public InstanceMapScript SaveToDB(); } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -447,7 +447,7 @@ class instance_serpent_shrine : public InstanceMapScript bool DoSpawnFrenzy; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_serpentshrine_cavern_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp index 9a7ca994291..ce28180bb78 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp @@ -52,7 +52,7 @@ class boss_hydromancer_thespia : public CreatureScript public: boss_hydromancer_thespia() : CreatureScript("boss_hydromancer_thespia") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_thespiaAI (creature); } @@ -70,7 +70,7 @@ public: uint32 LungBurst_Timer; uint32 EnvelopingWinds_Timer; - void Reset() + void Reset() OVERRIDE { LightningCloud_Timer = 15000; LungBurst_Timer = 7000; @@ -80,7 +80,7 @@ public: instance->SetData(TYPE_HYDROMANCER_THESPIA, NOT_STARTED); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEAD); @@ -88,12 +88,12 @@ public: instance->SetData(TYPE_HYDROMANCER_THESPIA, DONE); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -101,7 +101,7 @@ public: instance->SetData(TYPE_HYDROMANCER_THESPIA, IN_PROGRESS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -152,7 +152,7 @@ class npc_coilfang_waterelemental : public CreatureScript public: npc_coilfang_waterelemental() : CreatureScript("npc_coilfang_waterelemental") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_coilfang_waterelementalAI (creature); } @@ -163,14 +163,14 @@ public: uint32 WaterBoltVolley_Timer; - void Reset() + void Reset() OVERRIDE { WaterBoltVolley_Timer = 3000+rand()%3000; } - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp index feeac7d4a54..8662b2c93ec 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -61,7 +61,7 @@ class boss_mekgineer_steamrigger : public CreatureScript public: boss_mekgineer_steamrigger() : CreatureScript("boss_mekgineer_steamrigger") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_mekgineer_steamriggerAI (creature); } @@ -82,7 +82,7 @@ public: bool Summon50; bool Summon25; - void Reset() + void Reset() OVERRIDE { Shrink_Timer = 20000; Saw_Blade_Timer = 15000; @@ -96,7 +96,7 @@ public: instance->SetData(TYPE_MEKGINEER_STEAMRIGGER, NOT_STARTED); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -104,12 +104,12 @@ public: instance->SetData(TYPE_MEKGINEER_STEAMRIGGER, DONE); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -132,7 +132,7 @@ public: DoSpawnCreature(NPC_STREAMRIGGER_MECHANIC, 7, -5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -201,7 +201,7 @@ class npc_steamrigger_mechanic : public CreatureScript public: npc_steamrigger_mechanic() : CreatureScript("npc_steamrigger_mechanic") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_steamrigger_mechanicAI (creature); } @@ -217,19 +217,20 @@ public: uint32 Repair_Timer; - void Reset() + void Reset() OVERRIDE { Repair_Timer = 2000; } - void MoveInLineOfSight(Unit* /*who*/) + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE + { //react only if attacked } - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (Repair_Timer <= diff) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp index d8cbcc8b49d..ee3e9a69c65 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -49,7 +49,7 @@ class npc_naga_distiller : public CreatureScript public: npc_naga_distiller() : CreatureScript("npc_naga_distiller") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_naga_distillerAI (creature); } @@ -63,7 +63,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -79,7 +79,7 @@ public: } } - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} void StartRageGen(Unit* /*caster*/) { @@ -92,7 +92,7 @@ public: instance->SetData(TYPE_DISTILLER, IN_PROGRESS); } - void DamageTaken(Unit* /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) OVERRIDE { if (me->GetHealth() <= damage) if (instance) @@ -107,7 +107,7 @@ class boss_warlord_kalithresh : public CreatureScript public: boss_warlord_kalithresh() : CreatureScript("boss_warlord_kalithresh") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_warlord_kalithreshAI (creature); } @@ -126,7 +126,7 @@ public: uint32 Rage_Timer; bool CanRage; - void Reset() + void Reset() OVERRIDE { Reflection_Timer = 10000; Impale_Timer = 7000+rand()%7000; @@ -137,7 +137,7 @@ public: instance->SetData(TYPE_WARLORD_KALITHRESH, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -145,12 +145,12 @@ public: instance->SetData(TYPE_WARLORD_KALITHRESH, IN_PROGRESS); } - 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 { //hack :( if (spell->Id == SPELL_WARLORDS_RAGE_PROC) @@ -159,7 +159,7 @@ public: me->RemoveAurasDueToSpell(SPELL_WARLORDS_RAGE_PROC); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -167,7 +167,7 @@ public: instance->SetData(TYPE_WARLORD_KALITHRESH, DONE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp index 1beffd1d45d..9377ea9197f 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp @@ -41,7 +41,7 @@ class boss_hungarfen : public CreatureScript public: boss_hungarfen() : CreatureScript("boss_hungarfen") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_hungarfenAI (creature); } @@ -56,18 +56,18 @@ public: uint32 Mushroom_Timer; uint32 AcidGeyser_Timer; - void Reset() + void Reset() OVERRIDE { Root = false; Mushroom_Timer = 5000; // 1 mushroom after 5s, then one per 10s. This should be different in heroic mode AcidGeyser_Timer = 10000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -109,7 +109,7 @@ class npc_underbog_mushroom : public CreatureScript public: npc_underbog_mushroom() : CreatureScript("npc_underbog_mushroom") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_underbog_mushroomAI (creature); } @@ -122,7 +122,7 @@ public: uint32 Grow_Timer; uint32 Shrink_Timer; - void Reset() + void Reset() OVERRIDE { Stop = false; Grow_Timer = 0; @@ -132,13 +132,14 @@ public: DoCast(me, SPELL_SPORE_CLOUD, true); } - void MoveInLineOfSight(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void AttackStart(Unit* /*who*/) {} - void EnterCombat(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void UpdateAI(uint32 diff) OVERRIDE { if (Stop) return; diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp index e5d0726dca4..c76e677d206 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp @@ -47,7 +47,7 @@ class boss_the_black_stalker : public CreatureScript public: boss_the_black_stalker() : CreatureScript("boss_the_black_stalker") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_the_black_stalkerAI (creature); } @@ -68,7 +68,7 @@ public: uint32 check_Timer; std::list<uint64> Striders; - void Reset() + void Reset() OVERRIDE { Levitate_Timer = 12000; ChainLightning_Timer = 6000; @@ -80,9 +80,9 @@ public: Striders.clear(); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { if (summon && summon->GetEntry() == ENTRY_SPORE_STRIDER) { @@ -95,14 +95,14 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { for (std::list<uint64>::const_iterator i = Striders.begin(); i != Striders.end(); ++i) if (Creature* strider = Unit::GetCreature(*me, *i)) strider->DisappearAndDie(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index 22ddd76e9e8..9144411fcc6 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -60,7 +60,7 @@ class boss_gruul : public CreatureScript public: boss_gruul() : CreatureScript("boss_gruul") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_gruulAI (creature); } @@ -83,7 +83,7 @@ public: bool m_bPerformingGroundSlam; - void Reset() + void Reset() OVERRIDE { m_uiGrowth_Timer= 30000; m_uiCaveIn_Timer= 27000; @@ -97,7 +97,7 @@ public: instance->SetData(DATA_GRUULEVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -105,12 +105,12 @@ public: instance->SetData(DATA_GRUULEVENT, 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); @@ -121,7 +121,7 @@ public: } } - void SpellHitTarget(Unit* target, const SpellInfo* pSpell) + void SpellHitTarget(Unit* target, const SpellInfo* pSpell) OVERRIDE { //This to emulate effect1 (77) of SPELL_GROUND_SLAM, knock back to any direction //It's initially wrong, since this will cause fall damage, which is by comments, not intended. @@ -161,7 +161,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -263,7 +263,7 @@ class spell_gruul_shatter : public SpellScriptLoader { PrepareSpellScript(spell_gruul_shatter_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_STONED)) return false; @@ -281,13 +281,13 @@ class spell_gruul_shatter : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gruul_shatter_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gruul_shatter_SpellScript(); } @@ -316,13 +316,13 @@ class spell_gruul_shatter_effect : public SpellScriptLoader SetHitDamage(int32(GetHitDamage() * ((radius - distance) / radius))); } - void Register() + void Register() OVERRIDE { OnHit += SpellHitFn(spell_gruul_shatter_effect_SpellScript::CalculateDamage); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gruul_shatter_effect_SpellScript(); } diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp index f927f606bda..6fa6b9b2e20 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp @@ -110,7 +110,7 @@ class boss_high_king_maulgar : public CreatureScript public: boss_high_king_maulgar() : CreatureScript("boss_high_king_maulgar") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_high_king_maulgarAI (creature); } @@ -136,7 +136,7 @@ public: uint64 Council[4]; - void Reset() + void Reset() OVERRIDE { ArcingSmash_Timer = 10000; MightyBlow_Timer = 40000; @@ -167,12 +167,12 @@ public: instance->SetData(DATA_MAULGAREVENT, NOT_STARTED); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -185,7 +185,7 @@ public: Talk(SAY_OGRE_DEATH); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { StartEvent(who); } @@ -217,7 +217,7 @@ public: DoZoneInCombat(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Only if not incombat check if the event is started if (!me->IsInCombat() && instance && instance->GetData(DATA_MAULGAREVENT)) @@ -309,7 +309,7 @@ class boss_olm_the_summoner : public CreatureScript public: boss_olm_the_summoner() : CreatureScript("boss_olm_the_summoner") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_olm_the_summonerAI (creature); } @@ -327,7 +327,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { DarkDecay_Timer = 10000; Summon_Timer = 15000; @@ -338,7 +338,7 @@ public: instance->SetData(DATA_MAULGAREVENT, NOT_STARTED); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who) return; @@ -353,7 +353,7 @@ public: } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (instance) { @@ -362,7 +362,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -377,7 +377,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Only if not incombat check if the event is started if (!me->IsInCombat() && instance && instance->GetData(DATA_MAULGAREVENT)) @@ -437,7 +437,7 @@ class boss_kiggler_the_crazed : public CreatureScript public: boss_kiggler_the_crazed() : CreatureScript("boss_kiggler_the_crazed") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_kiggler_the_crazedAI (creature); } @@ -456,7 +456,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { GreaterPolymorph_Timer = 5000; LightningBolt_Timer = 10000; @@ -468,7 +468,7 @@ public: instance->SetData(DATA_MAULGAREVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (instance) { @@ -477,7 +477,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -492,7 +492,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Only if not incombat check if the event is started if (!me->IsInCombat() && instance && instance->GetData(DATA_MAULGAREVENT)) @@ -558,7 +558,7 @@ class boss_blindeye_the_seer : public CreatureScript public: boss_blindeye_the_seer() : CreatureScript("boss_blindeye_the_seer") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_blindeye_the_seerAI (creature); } @@ -576,7 +576,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { GreaterPowerWordShield_Timer = 5000; Heal_Timer = urand(25000, 40000); @@ -587,7 +587,7 @@ public: instance->SetData(DATA_MAULGAREVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (instance) { @@ -596,7 +596,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -611,7 +611,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Only if not incombat check if the event is started if (!me->IsInCombat() && instance && instance->GetData(DATA_MAULGAREVENT)) @@ -668,7 +668,7 @@ class boss_krosh_firehand : public CreatureScript public: boss_krosh_firehand() : CreatureScript("boss_krosh_firehand") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_krosh_firehandAI (creature); } @@ -686,7 +686,7 @@ public: InstanceScript* instance; - void Reset() + void Reset() OVERRIDE { GreaterFireball_Timer = 1000; SpellShield_Timer = 5000; @@ -697,7 +697,7 @@ public: instance->SetData(DATA_MAULGAREVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (instance) { @@ -706,7 +706,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -721,7 +721,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Only if not incombat check if the event is started if (!me->IsInCombat() && instance && instance->GetData(DATA_MAULGAREVENT)) diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp index e8aa6838d09..3fbdfe94c05 100644 --- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp +++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp @@ -39,7 +39,7 @@ class instance_gruuls_lair : public InstanceMapScript public: instance_gruuls_lair() : InstanceMapScript("instance_gruuls_lair", 565) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_gruuls_lair_InstanceMapScript(map); } @@ -111,13 +111,13 @@ public: } } - void SetData64(uint32 type, uint64 data) + void SetData64(uint32 type, uint64 data) OVERRIDE { if (type == DATA_MAULGAREVENT_TANK) MaulgarEvent_Tank = data; } - uint64 GetData64(uint32 identifier) const + uint64 GetData64(uint32 identifier) const OVERRIDE { switch (identifier) { @@ -133,7 +133,7 @@ public: return 0; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -156,7 +156,7 @@ public: SaveToDB(); } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index 39da979dd68..2f5e160b335 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -64,7 +64,7 @@ class boss_broggok : public CreatureScript uint32 PoisonBolt_Timer; bool canAttack; - void Reset() + void Reset() OVERRIDE { _Reset(); AcidSpray_Timer = 10000; @@ -74,12 +74,12 @@ class boss_broggok : public CreatureScript instance->SetData(TYPE_BROGGOK_EVENT, NOT_STARTED); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->setFaction(16); summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -87,7 +87,7 @@ class boss_broggok : public CreatureScript summoned->CastSpell(summoned, SPELL_POISON, false, 0, 0, me->GetGUID()); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -120,7 +120,7 @@ class boss_broggok : public CreatureScript DoMeleeAttackIfReady(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -130,7 +130,7 @@ class boss_broggok : public CreatureScript } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -152,7 +152,7 @@ class boss_broggok : public CreatureScript }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_broggokAI(creature); } @@ -163,7 +163,7 @@ class go_broggok_lever : public GameObjectScript public: go_broggok_lever() : GameObjectScript("go_broggok_lever") {} - bool OnGossipHello(Player* /*player*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE { if (InstanceScript* instance = go->GetInstanceScript()) if (instance->GetData(TYPE_BROGGOK_EVENT) != DONE && instance->GetData(TYPE_BROGGOK_EVENT) != IN_PROGRESS) diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp index 931f83bf884..fedf56eb929 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -97,7 +97,7 @@ class boss_kelidan_the_breaker : public CreatureScript bool addYell; uint64 Channelers[5]; - void Reset() + void Reset() OVERRIDE { ShadowVolley_Timer = 1000; BurningNova_Timer = 15000; @@ -112,7 +112,7 @@ class boss_kelidan_the_breaker : public CreatureScript instance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, NOT_STARTED); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { Talk(SAY_WAKE); if (me->IsNonMeleeSpellCasted(false)) @@ -122,7 +122,7 @@ class boss_kelidan_the_breaker : public CreatureScript instance->SetData(TYPE_KELIDAN_THE_BREAKER_EVENT, IN_PROGRESS); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { if (rand()%2) return; @@ -189,7 +189,7 @@ class boss_kelidan_the_breaker : public CreatureScript } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DIE); @@ -201,7 +201,7 @@ class boss_kelidan_the_breaker : public CreatureScript instance->HandleGameObject(instance->GetData64(DATA_DOOR6), true); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) { @@ -273,7 +273,7 @@ class boss_kelidan_the_breaker : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_kelidan_the_breakerAI(creature); } @@ -306,7 +306,7 @@ class npc_shadowmoon_channeler : public CreatureScript uint32 MarkOfShadow_Timer; uint32 check_Timer; - void Reset() + void Reset() OVERRIDE { ShadowBolt_Timer = 1000+rand()%1000; MarkOfShadow_Timer = 5000+rand()%2000; @@ -315,7 +315,7 @@ class npc_shadowmoon_channeler : public CreatureScript me->InterruptNonMeleeSpells(true); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (Creature* Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100)) CAST_AI(boss_kelidan_the_breaker::boss_kelidan_the_breakerAI, Kelidan->AI())->ChannelerEngaged(who); @@ -324,13 +324,13 @@ class npc_shadowmoon_channeler : public CreatureScript DoStartMovement(who); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (Creature* Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100)) CAST_AI(boss_kelidan_the_breaker::boss_kelidan_the_breakerAI, Kelidan->AI())->ChannelerDied(killer); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) { @@ -371,7 +371,7 @@ class npc_shadowmoon_channeler : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_shadowmoon_channelerAI(creature); } diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp index f200d533ceb..33e23c12d14 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -65,7 +65,7 @@ class boss_the_maker : public CreatureScript uint32 Domination_Timer; uint32 Knockdown_Timer; - void Reset() + void Reset() OVERRIDE { AcidSpray_Timer = 15000; ExplodingBreaker_Timer = 6000; @@ -79,7 +79,7 @@ class boss_the_maker : public CreatureScript instance->HandleGameObject(instance->GetData64(DATA_DOOR2), true); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -90,12 +90,12 @@ class boss_the_maker : public CreatureScript instance->HandleGameObject(instance->GetData64(DATA_DOOR2), false); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DIE); @@ -108,7 +108,7 @@ class boss_the_maker : public CreatureScript } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -154,7 +154,7 @@ class boss_the_maker : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_the_makerAI(creature); } diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp index 65ae859b5ae..22b1b776e40 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp @@ -175,7 +175,7 @@ class instance_blood_furnace : public InstanceMapScript BroggokLeverGUID = go->GetGUID(); //Broggok lever } - uint64 GetData64(uint32 data) const + uint64 GetData64(uint32 data) const OVERRIDE { switch (data) { @@ -201,7 +201,7 @@ class instance_blood_furnace : public InstanceMapScript return 0; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -231,7 +231,7 @@ class instance_blood_furnace : public InstanceMapScript } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -409,7 +409,7 @@ class instance_blood_furnace : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_blood_furnace_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp index 50b74cbc0c1..5edf604a108 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp @@ -75,7 +75,7 @@ class boss_omor_the_unscarred : public CreatureScript uint64 PlayerGUID; bool CanPullBack; - void Reset() + void Reset() OVERRIDE { Talk(SAY_WIPE); @@ -90,12 +90,12 @@ class boss_omor_the_unscarred : public CreatureScript CanPullBack = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { if (rand()%2) return; @@ -103,7 +103,7 @@ class boss_omor_the_unscarred : public CreatureScript Talk(SAY_KILL_1); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { Talk(SAY_SUMMON); @@ -113,12 +113,12 @@ class boss_omor_the_unscarred : public CreatureScript ++SummonedCount; } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DIE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -219,7 +219,7 @@ class boss_omor_the_unscarred : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_omor_the_unscarredAI(creature); } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index b3d89d0cf03..65e389f9eea 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -98,16 +98,16 @@ class boss_nazan : public CreatureScript uint64 VazrudenGUID; SpellInfo* liquid_fire; - void Reset() + void Reset() OVERRIDE { Fireball_Timer = 4000; Fly_Timer = 45000; Turn_Timer = 0; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned && summoned->GetEntry() == ENTRY_LIQUID_FIRE) { @@ -118,13 +118,13 @@ class boss_nazan : public CreatureScript } } - void SpellHitTarget(Unit* target, const SpellInfo* entry) + void SpellHitTarget(Unit* target, const SpellInfo* entry) OVERRIDE { if (target && entry->Id == uint32(SPELL_FIREBALL)) me->SummonCreature(ENTRY_LIQUID_FIRE, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), target->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 30000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -195,7 +195,7 @@ class boss_nazan : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_nazanAI(creature); } @@ -219,31 +219,31 @@ class boss_vazruden : public CreatureScript bool WipeSaid; uint32 UnsummonCheck; - void Reset() + void Reset() OVERRIDE { Revenge_Timer = 4000; UnsummonCheck = 2000; WipeSaid = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (who && who->GetEntry() != ENTRY_VAZRUDEN) Talk(SAY_KILL); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (killer && killer != me) Talk(SAY_DIE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) { @@ -273,7 +273,7 @@ class boss_vazruden : public CreatureScript DoMeleeAttackIfReady(); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_vazrudenAI(creature); } @@ -308,7 +308,7 @@ class boss_vazruden_the_herald : public CreatureScript bool summoned; bool lootSpawned; - void Reset() + void Reset() OVERRIDE { phase = 0; waypoint = 0; @@ -357,7 +357,7 @@ class boss_vazruden_the_herald : public CreatureScript } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (phase == 0) { @@ -367,7 +367,7 @@ class boss_vazruden_the_herald : public CreatureScript } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (!summoned) return; @@ -396,7 +396,7 @@ class boss_vazruden_the_herald : public CreatureScript sentryDown = true; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { switch (phase) { @@ -454,7 +454,7 @@ class boss_vazruden_the_herald : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_vazruden_the_heraldAI(creature); } @@ -474,20 +474,20 @@ class npc_hellfire_sentry : public CreatureScript uint32 KidneyShot_Timer; - void Reset() + void Reset() OVERRIDE { KidneyShot_Timer = urand(3000, 7000); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (Creature* herald = me->FindNearestCreature(ENTRY_VAZRUDEN_HERALD, 150)) CAST_AI(boss_vazruden_the_herald::boss_vazruden_the_heraldAI, herald->AI())->SentryDownBy(killer); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -504,7 +504,7 @@ class npc_hellfire_sentry : public CreatureScript DoMeleeAttackIfReady(); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_hellfire_sentryAI(creature); } diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp index 044c22f7ac0..837384dda2d 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -66,7 +66,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript bool HasTaunted; bool YelledForHeal; - void Reset() + void Reset() OVERRIDE { Surge_Timer = 5000; MortalWound_Timer = 4000; @@ -76,12 +76,13 @@ class boss_watchkeeper_gargolmar : public CreatureScript YelledForHeal = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!me->GetVictim() && me->CanCreatureAttack(who)) { @@ -102,17 +103,17 @@ class boss_watchkeeper_gargolmar : public CreatureScript } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DIE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -161,7 +162,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_watchkeeper_gargolmarAI(creature); } diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index d6d346e6603..f99bb4ade85 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -108,12 +108,12 @@ class npc_abyssal : public CreatureScript uint32 Despawn_Timer; uint32 trigger; - void Reset() + void Reset() OVERRIDE { FireBlast_Timer = 6000; } - void SpellHit(Unit*, const SpellInfo* spell) + void SpellHit(Unit*, const SpellInfo* spell) OVERRIDE { if (trigger == 2 && spell->Id == SPELL_BLAZE_TARGET) { @@ -136,22 +136,23 @@ class npc_abyssal : public CreatureScript } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!trigger) ScriptedAI::AttackStart(who); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!trigger) ScriptedAI::MoveInLineOfSight(who); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (trigger) { @@ -187,7 +188,7 @@ class npc_abyssal : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_abyssalAI(creature); } @@ -226,7 +227,7 @@ class boss_magtheridon : public CreatureScript bool Phase3; bool NeedCheckCube; - void Reset() + void Reset() OVERRIDE { Berserk_Timer = 1320000; Quake_Timer = 40000; @@ -246,7 +247,7 @@ class boss_magtheridon : public CreatureScript DoCast(me, SPELL_SHADOW_CAGE_C, true); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { if (instance) { @@ -306,12 +307,12 @@ class boss_magtheridon : public CreatureScript NeedCheckCube = false; } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_PLAYER_KILLED); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_MAGTHERIDON_EVENT, DONE); @@ -319,15 +320,16 @@ class boss_magtheridon : public CreatureScript Talk(SAY_DEATH); } - void MoveInLineOfSight(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!me->HasUnitState(UNIT_STATE_STUNNED)) ScriptedAI::AttackStart(who); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) instance->SetData(DATA_MAGTHERIDON_EVENT, IN_PROGRESS); @@ -339,7 +341,7 @@ class boss_magtheridon : public CreatureScript Talk(SAY_FREED); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!me->IsInCombat()) { @@ -453,7 +455,7 @@ class boss_magtheridon : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_magtheridonAI(creature); } @@ -484,7 +486,7 @@ class npc_hellfire_channeler : public CreatureScript uint32 Check_Timer; - void Reset() + void Reset() OVERRIDE { ShadowBoltVolley_Timer = urand(8000, 10000); DarkMending_Timer = 10000; @@ -494,7 +496,7 @@ class npc_hellfire_channeler : public CreatureScript Check_Timer = 5000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) instance->SetData(DATA_CHANNELER_EVENT, IN_PROGRESS); @@ -503,7 +505,7 @@ class npc_hellfire_channeler : public CreatureScript DoZoneInCombat(); } - void JustReachedHome() + void JustReachedHome() OVERRIDE { if (instance) instance->SetData(DATA_CHANNELER_EVENT, NOT_STARTED); @@ -511,24 +513,24 @@ class npc_hellfire_channeler : public CreatureScript DoCast(me, SPELL_SHADOW_GRASP_C, false); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { summon->AI()->AttackStart(me->GetVictim()); } - void DamageTaken(Unit*, uint32 &damage) + void DamageTaken(Unit*, uint32 &damage) OVERRIDE { if (damage >= me->GetHealth()) DoCast(me, SPELL_SOUL_TRANSFER, true); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_CHANNELER_EVENT, DONE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -572,7 +574,7 @@ class npc_hellfire_channeler : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_hellfire_channelerAI(creature); } @@ -586,7 +588,7 @@ public: { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { InstanceScript* instance = go->GetInstanceScript(); diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp index 75030ebc381..efca48505a8 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp @@ -123,7 +123,7 @@ class instance_magtheridons_lair : public InstanceMapScript } } - uint64 GetData64(uint32 type) const + uint64 GetData64(uint32 type) const OVERRIDE { switch (type) { @@ -133,7 +133,7 @@ class instance_magtheridons_lair : public InstanceMapScript return 0; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -211,7 +211,7 @@ class instance_magtheridons_lair : public InstanceMapScript } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { if (type == DATA_MAGTHERIDON_EVENT) return m_auiEncounter[0]; @@ -254,7 +254,7 @@ class instance_magtheridons_lair : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_magtheridons_lair_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index 44632b36647..3381524f17e 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -89,7 +89,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript uint32 ShadowFissure_Timer; uint32 Cleave_Timer; - void Reset() + void Reset() OVERRIDE { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -146,7 +146,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (IsIntroEvent || !IsMainEvent) return; @@ -160,7 +160,8 @@ class boss_grand_warlock_nethekurse : public CreatureScript } } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!IntroOnce && me->IsWithinDistInMap(who, 50.0f)) { @@ -181,12 +182,12 @@ class boss_grand_warlock_nethekurse : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->setFaction(16); summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -197,12 +198,12 @@ class boss_grand_warlock_nethekurse : public CreatureScript summoned->CastSpell(summoned, SPELL_CONSUMPTION, false, 0, 0, me->GetGUID()); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DIE); @@ -213,7 +214,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript instance->HandleGameObject(instance->GetData64(DATA_NETHEKURSE_DOOR), true); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (IsIntroEvent) { @@ -279,7 +280,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_grand_warlock_nethekurseAI(creature); } @@ -304,17 +305,18 @@ class npc_fel_orc_convert : public CreatureScript InstanceScript* instance; uint32 Hemorrhage_Timer; - void Reset() + void Reset() OVERRIDE { me->SetNoCallAssistance(true); //we don't want any assistance (WE R HEROZ!) Hemorrhage_Timer = 3000; } - void MoveInLineOfSight(Unit* /*who*/) + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE + { } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) { @@ -334,7 +336,7 @@ class npc_fel_orc_convert : public CreatureScript } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) { @@ -346,7 +348,7 @@ class npc_fel_orc_convert : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -361,7 +363,7 @@ class npc_fel_orc_convert : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_fel_orc_convertAI(creature); } @@ -381,13 +383,14 @@ class npc_lesser_shadow_fissure : public CreatureScript { npc_lesser_shadow_fissureAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() { } - void MoveInLineOfSight(Unit* /*who*/) {} - void AttackStart(Unit* /*who*/) {} - void EnterCombat(Unit* /*who*/) {} + void Reset() OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + + void AttackStart(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_lesser_shadow_fissureAI (creature); } diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp index 1caf30dd831..0387fca0e18 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -124,19 +124,19 @@ class npc_omrogg_heads : public CreatureScript bool DeathYell; uint32 Death_Timer; - void Reset() + void Reset() OVERRIDE { Death_Timer = 4000; DeathYell = false; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} void DoDeathYell() { DeathYell = true; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!DeathYell) return; @@ -150,7 +150,7 @@ class npc_omrogg_heads : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_omrogg_headsAI(creature); } @@ -195,7 +195,7 @@ class boss_warbringer_omrogg : public CreatureScript uint32 ThunderClap_Timer; uint32 ResetThreat_Timer; - void Reset() + void Reset() OVERRIDE { if (Unit* pLeftHead = Unit::GetUnit(*me, LeftHeadGUID)) { @@ -244,7 +244,7 @@ class boss_warbringer_omrogg : public CreatureScript ThreatYell = true; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { me->SummonCreature(NPC_LEFT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0); me->SummonCreature(NPC_RIGHT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0); @@ -263,7 +263,7 @@ class boss_warbringer_omrogg : public CreatureScript instance->SetData(TYPE_OMROGG, IN_PROGRESS); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned->GetEntry() == NPC_LEFT_HEAD) LeftHeadGUID = summoned->GetGUID(); @@ -276,7 +276,7 @@ class boss_warbringer_omrogg : public CreatureScript summoned->SetVisible(false); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Creature* pLeftHead = Creature::GetCreature(*me, LeftHeadGUID); Creature* pRightHead = Creature::GetCreature(*me, RightHeadGUID); @@ -302,7 +302,7 @@ class boss_warbringer_omrogg : public CreatureScript } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Creature* pLeftHead = Creature::GetCreature(*me, LeftHeadGUID); Creature* pRightHead = Creature::GetCreature(*me, RightHeadGUID); @@ -318,7 +318,7 @@ class boss_warbringer_omrogg : public CreatureScript instance->SetData(TYPE_OMROGG, DONE); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (Delay_Timer <= diff) { @@ -421,7 +421,7 @@ class boss_warbringer_omrogg : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_warbringer_omroggAI (creature); } diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp index 9e6eaf0b3d6..05f1bb7121c 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp @@ -88,7 +88,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript uint32 target_num; - void Reset() + void Reset() OVERRIDE { removeAdds(); @@ -106,12 +106,12 @@ class boss_warchief_kargath_bladefist : public CreatureScript resetcheck_timer = 5000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { switch (summoned->GetEntry()) { @@ -127,7 +127,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { if (victim->GetTypeId() == TYPEID_PLAYER) { @@ -135,13 +135,13 @@ class boss_warchief_kargath_bladefist : public CreatureScript } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); removeAdds(); } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (InBlade) { @@ -194,7 +194,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript me->SummonCreature(NPC_SHATTERED_ASSASSIN, AssassExit[0], AssassExit[1]-8, AssassExit[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Return since we have no target if (!UpdateVictim()) @@ -314,7 +314,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_warchief_kargath_bladefistAI(creature); } diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp index 95579aba002..0f00d73a81d 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp @@ -74,7 +74,7 @@ class instance_shattered_halls : public InstanceMapScript } } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -87,7 +87,7 @@ class instance_shattered_halls : public InstanceMapScript } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -99,7 +99,7 @@ class instance_shattered_halls : public InstanceMapScript return 0; } - uint64 GetData64(uint32 data) const + uint64 GetData64(uint32 data) const OVERRIDE { switch (data) { @@ -112,7 +112,7 @@ class instance_shattered_halls : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_shattered_halls_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 556b02606f7..389634a50bf 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -110,7 +110,7 @@ class boss_alar : public CreatureScript int8 cur_wp; - void Reset() + void Reset() OVERRIDE { if (instance) instance->SetData(DATA_ALAREVENT, NOT_STARTED); @@ -137,7 +137,7 @@ class boss_alar : public CreatureScript me->setActive(false); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance) instance->SetData(DATA_ALAREVENT, IN_PROGRESS); @@ -147,22 +147,23 @@ class boss_alar : public CreatureScript me->setActive(true); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance) instance->SetData(DATA_ALAREVENT, DONE); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { if (summon->GetEntry() == CREATURE_EMBER_OF_ALAR) if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) summon->AI()->AttackStart(target); } - void MoveInLineOfSight(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void AttackStart(Unit* who) + + void AttackStart(Unit* who) OVERRIDE { if (Phase1) AttackStartNoMove(who); @@ -170,7 +171,7 @@ class boss_alar : public CreatureScript ScriptedAI::AttackStart(who); } - void DamageTaken(Unit* /*killer*/, uint32 &damage) + void DamageTaken(Unit* /*killer*/, uint32 &damage) OVERRIDE { if (damage >= me->GetHealth() && Phase1) { @@ -192,7 +193,7 @@ class boss_alar : public CreatureScript } } - void SpellHit(Unit*, const SpellInfo* spell) + void SpellHit(Unit*, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_DIVE_BOMB_VISUAL) { @@ -202,7 +203,7 @@ class boss_alar : public CreatureScript } } - void MovementInform(uint32 type, uint32 /*id*/) + void MovementInform(uint32 type, uint32 /*id*/) OVERRIDE { if (type == POINT_MOTION_TYPE) { @@ -212,7 +213,7 @@ class boss_alar : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!me->IsInCombat()) // sometimes IsInCombat but !incombat, faction bug? return; @@ -452,7 +453,7 @@ class boss_alar : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_alarAI(creature); } @@ -479,20 +480,20 @@ class npc_ember_of_alar : public CreatureScript InstanceScript* instance; bool toDie; - void Reset() + void Reset() OVERRIDE { toDie = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { me->setDeathState(JUST_DIED); } - void DamageTaken(Unit* killer, uint32 &damage) + void DamageTaken(Unit* killer, uint32 &damage) OVERRIDE { if (damage >= me->GetHealth() && killer != me && !toDie) { @@ -515,7 +516,7 @@ class npc_ember_of_alar : public CreatureScript } } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!UpdateVictim()) return; @@ -531,7 +532,7 @@ class npc_ember_of_alar : public CreatureScript }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ember_of_alarAI(creature); } @@ -549,14 +550,15 @@ class npc_flame_patch_alar : public CreatureScript struct npc_flame_patch_alarAI : public ScriptedAI { npc_flame_patch_alarAI(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 {} }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_flame_patch_alarAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index 18f72698beb..5a070017986 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -130,7 +130,7 @@ class boss_high_astromancer_solarian : public CreatureScript bool AppearDelay; bool BlindingLight; - void Reset() + void Reset() OVERRIDE { ArcaneMissiles_Timer = 2000; m_uiWrathOfTheAstromancer_Timer = 15000; @@ -158,12 +158,12 @@ class boss_high_astromancer_solarian : public CreatureScript Summons.DespawnAll(); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { me->SetObjectScale(defaultsize); me->SetDisplayId(MODEL_HUMAN); @@ -172,7 +172,7 @@ class boss_high_astromancer_solarian : public CreatureScript instance->SetData(DATA_HIGHASTROMANCERSOLARIANEVENT, DONE); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); DoZoneInCombat(); @@ -208,7 +208,7 @@ class boss_high_astromancer_solarian : public CreatureScript return (z*sqrt(radius*radius - (x - CENTER_X)*(x - CENTER_X)) + CENTER_Y); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -417,7 +417,7 @@ class boss_high_astromancer_solarian : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_high_astromancer_solarianAI (creature); } @@ -445,18 +445,18 @@ class npc_solarium_priest : public CreatureScript uint32 holysmiteTimer; uint32 aoesilenceTimer; - void Reset() + void Reset() OVERRIDE { healTimer = 9000; holysmiteTimer = 1; aoesilenceTimer = 15000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -504,7 +504,7 @@ class npc_solarium_priest : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_solarium_priestAI(creature); } @@ -519,7 +519,7 @@ class spell_astromancer_wrath_of_the_astromancer : public SpellScriptLoader { PrepareAuraScript(spell_astromancer_wrath_of_the_astromancer_AuraScript); - bool Validate(SpellInfo const* /*SpellEntry*/) + bool Validate(SpellInfo const* /*SpellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WRATH_OF_THE_ASTROMANCER_DOT)) return false; @@ -536,13 +536,13 @@ class spell_astromancer_wrath_of_the_astromancer : public SpellScriptLoader target->CastSpell(target, GetSpellInfo()->Effects[EFFECT_1].CalcValue(), false); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_astromancer_wrath_of_the_astromancer_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_astromancer_wrath_of_the_astromancer_AuraScript(); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index d0d580c824b..cf25efb17c6 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -165,7 +165,7 @@ struct advisorbase_ai : public ScriptedAI uint32 DelayRes_Timer; uint64 DelayRes_Target; - void Reset() + void Reset() OVERRIDE { if (m_bDoubled_Health) { @@ -187,7 +187,8 @@ struct advisorbase_ai : public ScriptedAI Kaelthas->AI()->EnterEvadeMode(); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!who || FakeDeath || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -195,7 +196,7 @@ struct advisorbase_ai : public ScriptedAI ScriptedAI::MoveInLineOfSight(who); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who || FakeDeath || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -216,7 +217,7 @@ struct advisorbase_ai : public ScriptedAI DelayRes_Timer = 2000; } - void DamageTaken(Unit* killer, uint32 &damage) + void DamageTaken(Unit* killer, uint32 &damage) OVERRIDE { if (damage < me->GetHealth()) return; @@ -252,7 +253,7 @@ struct advisorbase_ai : public ScriptedAI } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (DelayRes_Timer) { @@ -317,7 +318,7 @@ class boss_kaelthas : public CreatureScript uint64 m_auiAdvisorGuid[MAX_ADVISORS]; - void Reset() + void Reset() OVERRIDE { Fireball_Timer = 5000+rand()%10000; ArcaneDisruption_Timer = 45000; @@ -402,7 +403,8 @@ class boss_kaelthas : public CreatureScript } } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!me->HasUnitState(UNIT_STATE_STUNNED) && me->CanCreatureAttack(who)) { @@ -429,18 +431,18 @@ class boss_kaelthas : public CreatureScript } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (instance && !instance->GetData(DATA_KAELTHASEVENT) && !Phase) StartEvent(); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { // if not phoenix, then it's one of the 7 weapons if (summoned->GetEntry() != NPC_PHOENIX) @@ -452,12 +454,12 @@ class boss_kaelthas : public CreatureScript } } - void SummonedCreatureDespawn(Creature* summon) + void SummonedCreatureDespawn(Creature* summon) OVERRIDE { summons.Despawn(summon); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -476,7 +478,7 @@ class boss_kaelthas : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Phase 1 switch (Phase) @@ -1007,7 +1009,7 @@ class boss_kaelthas : public CreatureScript } } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_kaelthasAI(creature); } @@ -1030,7 +1032,7 @@ class boss_thaladred_the_darkener : public CreatureScript uint32 Silence_Timer; uint32 PsychicBlow_Timer; - void Reset() + void Reset() OVERRIDE { Gaze_Timer = 100; Silence_Timer = 20000; @@ -1039,7 +1041,7 @@ class boss_thaladred_the_darkener : public CreatureScript advisorbase_ai::Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1051,13 +1053,13 @@ class boss_thaladred_the_darkener : public CreatureScript me->AddThreat(who, 5000000.0f); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance && instance->GetData(DATA_KAELTHASEVENT) == 3) Talk(SAY_THALADRED_DEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { advisorbase_ai::UpdateAI(diff); @@ -1105,7 +1107,7 @@ class boss_thaladred_the_darkener : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_thaladred_the_darkenerAI(creature); } @@ -1126,13 +1128,13 @@ class boss_lord_sanguinar : public CreatureScript uint32 Fear_Timer; - void Reset() + void Reset() OVERRIDE { Fear_Timer = 20000; advisorbase_ai::Reset(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1143,13 +1145,13 @@ class boss_lord_sanguinar : public CreatureScript Talk(SAY_SANGUINAR_AGGRO); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance && instance->GetData(DATA_KAELTHASEVENT) == 3) Talk(SAY_SANGUINAR_DEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { advisorbase_ai::UpdateAI(diff); @@ -1173,7 +1175,7 @@ class boss_lord_sanguinar : public CreatureScript DoMeleeAttackIfReady(); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_lord_sanguinarAI(creature); } @@ -1197,7 +1199,7 @@ class boss_grand_astromancer_capernian : public CreatureScript uint32 Yell_Timer; bool Yell; - void Reset() + void Reset() OVERRIDE { Fireball_Timer = 2000; Conflagration_Timer = 20000; @@ -1208,13 +1210,13 @@ class boss_grand_astromancer_capernian : public CreatureScript advisorbase_ai::Reset(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance && instance->GetData(DATA_KAELTHASEVENT) == 3) Talk(SAY_CAPERNIAN_DEATH); } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (!who || FakeDeath || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1229,7 +1231,7 @@ class boss_grand_astromancer_capernian : public CreatureScript } } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1238,7 +1240,7 @@ class boss_grand_astromancer_capernian : public CreatureScript return; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { advisorbase_ai::UpdateAI(diff); @@ -1317,7 +1319,7 @@ class boss_grand_astromancer_capernian : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_grand_astromancer_capernianAI(creature); } @@ -1339,7 +1341,7 @@ class boss_master_engineer_telonicus : public CreatureScript uint32 Bomb_Timer; uint32 RemoteToy_Timer; - void Reset() + void Reset() OVERRIDE { Bomb_Timer = 10000; RemoteToy_Timer = 5000; @@ -1347,13 +1349,13 @@ class boss_master_engineer_telonicus : public CreatureScript advisorbase_ai::Reset(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (instance && instance->GetData(DATA_KAELTHASEVENT) == 3) Talk(SAY_TELONICUS_DEATH); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -1364,7 +1366,7 @@ class boss_master_engineer_telonicus : public CreatureScript Talk(SAY_TELONICUS_AGGRO); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { advisorbase_ai::UpdateAI(diff); @@ -1400,7 +1402,7 @@ class boss_master_engineer_telonicus : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_master_engineer_telonicusAI(creature); } @@ -1426,7 +1428,7 @@ class npc_kael_flamestrike : public CreatureScript bool Casting; bool KillSelf; - void Reset() + void Reset() OVERRIDE { Timer = 5000; Casting = false; @@ -1436,11 +1438,12 @@ class npc_kael_flamestrike : public CreatureScript me->setFaction(14); } - void MoveInLineOfSight(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void EnterCombat(Unit* /*who*/) {} - void UpdateAI(uint32 diff) + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void UpdateAI(uint32 diff) OVERRIDE { if (!Casting) { @@ -1467,7 +1470,7 @@ class npc_kael_flamestrike : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_kael_flamestrikeAI(creature); } @@ -1488,20 +1491,20 @@ class npc_phoenix_tk : public CreatureScript uint32 Cycle_Timer; - void Reset() + void Reset() OVERRIDE { Cycle_Timer = 2000; DoCast(me, SPELL_BURN, true); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { //is this spell in use anylonger? //DoCast(me, SPELL_EMBER_BLAST, true); me->SummonCreature(NPC_PHOENIX_EGG, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 16000); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1521,7 +1524,7 @@ class npc_phoenix_tk : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_phoenix_tkAI(creature); } @@ -1542,15 +1545,16 @@ class npc_phoenix_egg_tk : public CreatureScript uint32 Rebirth_Timer; - void Reset() + void Reset() OVERRIDE { Rebirth_Timer = 15000; } //ignore any - void MoveInLineOfSight(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (me->Attack(who, false)) { @@ -1561,13 +1565,13 @@ class npc_phoenix_egg_tk : public CreatureScript } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AddThreat(me->GetVictim(), 0.0f); summoned->CastSpell(summoned, SPELL_REBIRTH, false); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!Rebirth_Timer) return; @@ -1582,7 +1586,7 @@ class npc_phoenix_egg_tk : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_phoenix_egg_tkAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp index 63e3d8b42ea..f842ed19f3c 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -68,7 +68,7 @@ class boss_void_reaver : public CreatureScript bool Enraged; - void Reset() + void Reset() OVERRIDE { Pounding_Timer = 15000; ArcaneOrb_Timer = 3000; @@ -81,12 +81,12 @@ class boss_void_reaver : public CreatureScript instance->SetData(DATA_VOIDREAVEREVENT, NOT_STARTED); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); DoZoneInCombat(); @@ -95,7 +95,7 @@ class boss_void_reaver : public CreatureScript instance->SetData(DATA_VOIDREAVEREVENT, DONE); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); @@ -103,7 +103,7 @@ class boss_void_reaver : public CreatureScript instance->SetData(DATA_VOIDREAVEREVENT, IN_PROGRESS); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -170,7 +170,7 @@ class boss_void_reaver : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_void_reaverAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp index e43d2f9b13a..e47995befff 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp @@ -113,7 +113,7 @@ class instance_the_eye : public InstanceMapScript } } - uint64 GetData64(uint32 identifier) const + uint64 GetData64(uint32 identifier) const OVERRIDE { switch (identifier) { @@ -128,7 +128,7 @@ class instance_the_eye : public InstanceMapScript return 0; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -151,7 +151,7 @@ class instance_the_eye : public InstanceMapScript SaveToDB(); } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -192,7 +192,7 @@ class instance_the_eye : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_the_eye_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp index 8ba7a4722bb..ab9b6ab3046 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp @@ -52,17 +52,17 @@ class npc_crystalcore_devastator : public CreatureScript uint32 Knockaway_Timer; uint32 Countercharge_Timer; - void Reset() + void Reset() OVERRIDE { Countercharge_Timer = 9000; Knockaway_Timer = 25000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -100,7 +100,7 @@ class npc_crystalcore_devastator : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_crystalcore_devastatorAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp index 18ea83f7121..d4a38cc3566 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp @@ -59,13 +59,13 @@ class boss_gatewatcher_gyrokill : public CreatureScript { boss_gatewatcher_gyrokillAI(Creature* creature) : BossAI(creature, DATA_GATEWATCHER_GYROKILL) {} - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 10000); @@ -74,12 +74,12 @@ class boss_gatewatcher_gyrokill : public CreatureScript Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -115,7 +115,7 @@ class boss_gatewatcher_gyrokill : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_gatewatcher_gyrokillAI (creature); } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp index 5e29a8d0c31..7dc073d82d7 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_ironhand.cpp @@ -62,7 +62,7 @@ class boss_gatewatcher_iron_hand : public CreatureScript { boss_gatewatcher_iron_handAI(Creature* creature) : BossAI(creature, DATA_GATEWATCHER_IRON_HAND) {} - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, 55000); @@ -71,19 +71,19 @@ class boss_gatewatcher_iron_hand : public CreatureScript Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { if (roll_chance_i(50)) Talk(SAY_SLAY); } - 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; @@ -122,7 +122,7 @@ class boss_gatewatcher_iron_hand : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_gatewatcher_iron_handAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp index 728b3f715b2..06296ca3ae2 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp @@ -75,7 +75,7 @@ class boss_mechano_lord_capacitus : public CreatureScript { boss_mechano_lord_capacitusAI(Creature* creature) : BossAI(creature, DATA_MECHANOLORD_CAPACITUS) { } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Talk(YELL_AGGRO); @@ -88,18 +88,18 @@ class boss_mechano_lord_capacitus : public CreatureScript events.ScheduleEvent(EVENT_POSITIVE_SHIFT, 15 * IN_MILLISECONDS); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(YELL_KILL); } - void JustDied(Unit* /*victim*/) + void JustDied(Unit* /*victim*/) OVERRIDE { _JustDied(); Talk(YELL_DEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -149,7 +149,7 @@ class boss_mechano_lord_capacitus : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_mechano_lord_capacitusAI(creature); } @@ -164,7 +164,7 @@ class spell_capacitus_polarity_charge : public SpellScriptLoader { PrepareSpellScript(spell_capacitus_polarity_charge_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_POSITIVE_CHARGE)) return false; @@ -210,14 +210,14 @@ class spell_capacitus_polarity_charge : public SpellScriptLoader SetHitDamage(0); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_capacitus_polarity_charge_SpellScript::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_capacitus_polarity_charge_SpellScript::HandleTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_capacitus_polarity_charge_SpellScript(); } @@ -232,7 +232,7 @@ class spell_capacitus_polarity_shift : public SpellScriptLoader { PrepareSpellScript(spell_capacitus_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; @@ -247,13 +247,13 @@ class spell_capacitus_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_capacitus_polarity_shift_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_capacitus_polarity_shift_SpellScript(); } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp index f77c54c25e6..565aefbd6b9 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -67,7 +67,7 @@ class boss_nethermancer_sepethrea : public CreatureScript { boss_nethermancer_sepethreaAI(Creature* creature) : BossAI(creature, DATA_NETHERMANCER_SEPRETHREA) {} - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_FROST_ATTACK, urand(7000, 10000)); @@ -80,18 +80,18 @@ class boss_nethermancer_sepethrea : public CreatureScript Talk(SAY_SUMMON); } - 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); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -136,7 +136,7 @@ class boss_nethermancer_sepethrea : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_nethermancer_sepethreaAI(creature); } @@ -162,7 +162,7 @@ class npc_ragin_flames : public CreatureScript bool onlyonce; - void Reset() + void Reset() OVERRIDE { inferno_Timer = 10000; flame_timer = 500; @@ -173,11 +173,11 @@ class npc_ragin_flames : public CreatureScript me->SetSpeed(MOVE_RUN, DUNGEON_MODE(0.5f, 0.7f)); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Check_Timer if (Check_Timer <= diff) @@ -221,7 +221,7 @@ class npc_ragin_flames : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ragin_flamesAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp index adcfff10684..30194bb20d9 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp @@ -75,7 +75,7 @@ class boss_pathaleon_the_calculator : public CreatureScript { boss_pathaleon_the_calculatorAI(Creature* creature) : BossAI(creature, DATA_PATHALEON_THE_CALCULATOR) { } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); events.ScheduleEvent(EVENT_SUMMON, 30000); @@ -86,18 +86,18 @@ class boss_pathaleon_the_calculator : public CreatureScript Talk(SAY_AGGRO); } - 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); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) + void DamageTaken(Unit* /*attacker*/, uint32& damage) OVERRIDE { if (me->HealthBelowPctDamaged(20, damage) && !me->HasAura(SPELL_FRENZY)) { @@ -106,7 +106,7 @@ class boss_pathaleon_the_calculator : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -158,7 +158,7 @@ class boss_pathaleon_the_calculator : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_pathaleon_the_calculatorAI (creature); } @@ -179,7 +179,7 @@ class npc_nether_wraith : public CreatureScript uint32 Die_Timer; bool Detonation; - void Reset() + void Reset() OVERRIDE { ArcaneMissiles_Timer = urand(1000, 4000); Detonation_Timer = 20000; @@ -187,9 +187,9 @@ class npc_nether_wraith : public CreatureScript Detonation = false; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -230,7 +230,7 @@ class npc_nether_wraith : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_nether_wraithAI (creature); } diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp index 146569db284..64ebef52a87 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp @@ -135,7 +135,7 @@ class instance_mechanar : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_mechanar_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index 96dc4d06588..f03cb033b0f 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -91,7 +91,7 @@ class npc_millhouse_manastorm : public CreatureScript uint32 Pyroblast_Timer; uint32 Fireball_Timer; - void Reset() + void Reset() OVERRIDE { EventProgress_Timer = 2000; LowHp = false; @@ -111,7 +111,7 @@ class npc_millhouse_manastorm : public CreatureScript } } - void AttackStart(Unit* who) + void AttackStart(Unit* who) OVERRIDE { if (me->Attack(who, true)) { @@ -122,14 +122,14 @@ class npc_millhouse_manastorm : public CreatureScript } } - void EnterCombat(Unit* /*who*/){} + void EnterCombat(Unit* /*who*/)OVERRIDE {} - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); @@ -138,7 +138,7 @@ class npc_millhouse_manastorm : public CreatureScript ->FailQuest();*/ } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!Init) { @@ -221,7 +221,7 @@ class npc_millhouse_manastorm : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_millhouse_manastormAI(creature); } @@ -293,7 +293,7 @@ class npc_warden_mellichar : public CreatureScript uint32 EventProgress_Timer; uint32 Phase; - void Reset() + void Reset() OVERRIDE { IsRunning = false; CanSpawn = false; @@ -308,9 +308,10 @@ class npc_warden_mellichar : public CreatureScript instance->SetData(TYPE_HARBINGERSKYRISS, NOT_STARTED); } - void AttackStart(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) OVERRIDE {} + + void MoveInLineOfSight(Unit* who) OVERRIDE - void MoveInLineOfSight(Unit* who) { if (IsRunning) return; @@ -328,7 +329,7 @@ class npc_warden_mellichar : public CreatureScript } } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(YELL_INTRO1); DoCast(me, SPELL_BUBBLE_VISUAL); @@ -398,7 +399,7 @@ class npc_warden_mellichar : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!IsRunning) return; @@ -514,7 +515,7 @@ class npc_warden_mellichar : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_warden_mellicharAI(creature); } @@ -540,7 +541,7 @@ class npc_zerekethvoidzone : public CreatureScript { npc_zerekethvoidzoneAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { me->SetUInt32Value(UNIT_NPC_FLAGS, 0); me->setFaction(16); @@ -549,10 +550,10 @@ class npc_zerekethvoidzone : public CreatureScript DoCast(me, SPELL_VOID_ZONE_DAMAGE); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_zerekethvoidzoneAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp index c5261b48b78..ea20626281c 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -87,7 +87,7 @@ class boss_harbinger_skyriss : public CreatureScript uint32 Domination_Timer; uint32 ManaBurn_Timer; - void Reset() + void Reset() OVERRIDE { if (!Intro) me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); @@ -103,7 +103,8 @@ class boss_harbinger_skyriss : public CreatureScript ManaBurn_Timer = 25000; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!Intro) return; @@ -111,16 +112,16 @@ class boss_harbinger_skyriss : public CreatureScript ScriptedAI::MoveInLineOfSight(who); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); if (instance) instance->SetData(TYPE_HARBINGERSKYRISS, DONE); } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { if (!summon) return; @@ -133,7 +134,7 @@ class boss_harbinger_skyriss : public CreatureScript summon->AI()->AttackStart(target); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { //won't yell killing pet/other unit if (victim->GetEntry() == 21436) @@ -155,7 +156,7 @@ class boss_harbinger_skyriss : public CreatureScript DoCast(me, SPELL_33_ILLUSION); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!Intro) { @@ -272,7 +273,7 @@ class boss_harbinger_skyriss : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_harbinger_skyrissAI (creature); } @@ -290,12 +291,12 @@ class boss_harbinger_skyriss_illusion : public CreatureScript { boss_harbinger_skyriss_illusionAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() { } + void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_harbinger_skyriss_illusionAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp index c6fdda02d71..725c5c5aa17 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp @@ -148,7 +148,7 @@ class instance_arcatraz : public InstanceMapScript MellicharGUID = creature->GetGUID(); } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) OVERRIDE { switch (type) { @@ -230,7 +230,7 @@ class instance_arcatraz : public InstanceMapScript } } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { switch (type) { @@ -244,7 +244,7 @@ class instance_arcatraz : public InstanceMapScript return 0; } - uint64 GetData64(uint32 data) const + uint64 GetData64(uint32 data) const OVERRIDE { switch (data) { @@ -255,7 +255,7 @@ class instance_arcatraz : public InstanceMapScript } }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_arcatraz_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp index 6775fb95824..bd67f4be8b7 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp @@ -52,13 +52,13 @@ class boss_commander_sarannis : public CreatureScript { boss_commander_sarannisAI(Creature* creature) : BossAI(creature, DATA_COMMANDER_SARANNIS) { } - void Reset() + void Reset() OVERRIDE { _Reset(); _phase = true; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Talk(SAY_AGGRO); @@ -66,18 +66,18 @@ class boss_commander_sarannis : public CreatureScript events.ScheduleEvent(EVENT_ARCANE_DEVASTATION, 15200); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); } - void DamageTaken(Unit* /*killer*/, uint32 &damage) + void DamageTaken(Unit* /*killer*/, uint32 &damage) OVERRIDE { if (me->HealthBelowPctDamaged(50, damage) && _phase) { @@ -88,12 +88,12 @@ class boss_commander_sarannis : public CreatureScript } } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { BossAI::JustSummoned(summon); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -129,7 +129,7 @@ class boss_commander_sarannis : public CreatureScript bool _phase; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_commander_sarannisAI(creature); } @@ -167,13 +167,13 @@ class spell_commander_sarannis_summon_reinforcements : public SpellScriptLoader GetCaster()->SummonCreature(NPC_SUMMONED_BLOODWARDER_RESERVIST, PosSummonReinforcements[3], TEMPSUMMON_CORPSE_DESPAWN); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_commander_sarannis_summon_reinforcements_SpellScript::HandleCast, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_commander_sarannis_summon_reinforcements_SpellScript(); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp index e17e2b460c5..1b362fe8a5a 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp @@ -74,7 +74,7 @@ class boss_high_botanist_freywinn : public CreatureScript uint32 DeadAddsCount; bool MoveFree; - void Reset() + void Reset() OVERRIDE { Adds_List.clear(); @@ -85,12 +85,12 @@ class boss_high_botanist_freywinn : public CreatureScript MoveFree = true; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned->GetEntry() == NPC_FRAYER) Adds_List.push_back(summoned->GetGUID()); @@ -107,17 +107,17 @@ class boss_high_botanist_freywinn : public CreatureScript } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -200,7 +200,7 @@ class boss_high_botanist_freywinn : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_high_botanist_freywinnAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp index 14126f539ff..fe9e7d87008 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp @@ -70,7 +70,7 @@ class boss_laj : public CreatureScript uint32 Transform_Timer; uint32 Allergic_Timer; - void Reset() + void Reset() OVERRIDE { me->SetDisplayId(MODEL_DEFAULT); me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_SHADOW, true); @@ -157,17 +157,17 @@ class boss_laj : public CreatureScript CanSummon = false; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { if (summon && me->GetVictim()) summon->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0)); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -213,7 +213,7 @@ class boss_laj : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_lajAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp index 70b626190b7..d2a1b294698 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp @@ -54,14 +54,14 @@ class boss_thorngrin_the_tender : public CreatureScript { boss_thorngrin_the_tenderAI(Creature* creature) : BossAI(creature, DATA_THORNGRIN_THE_TENDER) { } - void Reset() + void Reset() OVERRIDE { _Reset(); _phase1 = true; _phase2 = true; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { _EnterCombat(); Talk(SAY_AGGRO); @@ -70,18 +70,18 @@ class boss_thorngrin_the_tender : public CreatureScript events.ScheduleEvent(EVENT_ENRAGE, 12000); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { _JustDied(); Talk(SAY_DEATH); } - void DamageTaken(Unit* /*killer*/, uint32 &damage) + void DamageTaken(Unit* /*killer*/, uint32 &damage) OVERRIDE { if (me->HealthBelowPctDamaged(50, damage) && _phase1) { @@ -95,7 +95,7 @@ class boss_thorngrin_the_tender : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -140,7 +140,7 @@ class boss_thorngrin_the_tender : public CreatureScript bool _phase2; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_thorngrin_the_tenderAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index 5bb91b384a1..d3fe23353e7 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -81,16 +81,17 @@ class npc_warp_splinter_treant : public CreatureScript uint64 WarpGuid; uint32 check_Timer; - void Reset() + void Reset() OVERRIDE { check_Timer = 0; } - 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 (!UpdateVictim()) { @@ -118,7 +119,7 @@ class npc_warp_splinter_treant : public CreatureScript DoMeleeAttackIfReady(); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_warp_splinter_treantAI(creature); } @@ -150,7 +151,7 @@ class boss_warp_splinter : public CreatureScript float Treant_Spawn_Pos_X; float Treant_Spawn_Pos_Y; - void Reset() + void Reset() OVERRIDE { War_Stomp_Timer = urand(25000, 40000); Summon_Treants_Timer = 45000; @@ -159,17 +160,17 @@ class boss_warp_splinter : public CreatureScript me->SetSpeed(MOVE_RUN, 0.7f, true); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) OVERRIDE { Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); } @@ -190,7 +191,7 @@ class boss_warp_splinter : public CreatureScript Talk(SAY_SUMMON); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -226,7 +227,7 @@ class boss_warp_splinter : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_warp_splinterAI(creature); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp index 69b95e8c813..443a8aa55fa 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp @@ -59,7 +59,7 @@ class instance_the_botanica : public InstanceMapScript } } - uint64 GetData64(uint32 type) const + uint64 GetData64(uint32 type) const OVERRIDE { switch (type) { @@ -152,7 +152,7 @@ class instance_the_botanica : public InstanceMapScript uint64 WarpSplinterGUID; }; - InstanceScript* GetInstanceScript(InstanceMap* map) const + InstanceScript* GetInstanceScript(InstanceMap* map) const OVERRIDE { return new instance_the_botanica_InstanceMapScript(map); } diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp index 0e66893d3ac..943838ae85d 100644 --- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp +++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp @@ -69,7 +69,7 @@ class boss_doomlord_kazzak : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _events.Reset(); _events.ScheduleEvent(EVENT_SHADOW_VOLLEY, urand(6000, 10000)); @@ -82,17 +82,17 @@ class boss_doomlord_kazzak : public CreatureScript _events.ScheduleEvent(EVENT_BERSERK, 180000); } - void JustRespawned() + void JustRespawned() OVERRIDE { Talk(SAY_INTRO); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { // When Kazzak kills a player (not pets/totems), he regens some health if (victim->GetTypeId() != TYPEID_PLAYER) @@ -103,12 +103,12 @@ class boss_doomlord_kazzak : public CreatureScript Talk(SAY_KILL); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { // Return since we have no target if (!UpdateVictim()) @@ -169,7 +169,7 @@ class boss_doomlord_kazzak : public CreatureScript EventMap _events; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_doomlordkazzakAI (creature); } @@ -184,7 +184,7 @@ class spell_mark_of_kazzak : public SpellScriptLoader { PrepareAuraScript(spell_mark_of_kazzak_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MARK_OF_KAZZAK_DAMAGE)) return false; @@ -209,14 +209,14 @@ class spell_mark_of_kazzak : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mark_of_kazzak_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_MANA_LEECH); OnEffectPeriodic += AuraEffectPeriodicFn(spell_mark_of_kazzak_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_MANA_LEECH); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mark_of_kazzak_AuraScript(); } diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp index 33896800ada..ccce7450923 100644 --- a/src/server/scripts/Outland/boss_doomwalker.cpp +++ b/src/server/scripts/Outland/boss_doomwalker.cpp @@ -59,7 +59,7 @@ class boss_doomwalker : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _events.Reset(); _events.ScheduleEvent(EVENT_ENRAGE, 0); @@ -70,7 +70,7 @@ class boss_doomwalker : public CreatureScript _inEnrage = false; } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) OVERRIDE { victim->CastSpell(victim, SPELL_MARK_DEATH, 0); @@ -80,24 +80,25 @@ class boss_doomwalker : public CreatureScript Talk(SAY_SLAY); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(SAY_DEATH); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { Talk(SAY_AGGRO); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (who && who->GetTypeId() == TYPEID_PLAYER && me->IsValidAttackTarget(who)) if (who->HasAura(SPELL_MARK_DEATH, 0)) who->CastSpell(who, SPELL_AURA_DEATH, 1); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -158,7 +159,7 @@ class boss_doomwalker : public CreatureScript bool _inEnrage; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_doomwalkerAI (creature); } diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp index c10f119f00f..1321b1457f1 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -60,7 +60,7 @@ class npc_bladespire_ogre : public CreatureScript public: npc_bladespire_ogre() : CreatureScript("npc_bladespire_ogre") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_bladespire_ogreAI (creature); } @@ -69,9 +69,9 @@ public: { npc_bladespire_ogreAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() { } + void Reset() OVERRIDE {} - void UpdateAI(uint32 /*uiDiff*/) + void UpdateAI(uint32 /*uiDiff*/) OVERRIDE { if (!UpdateVictim()) return; @@ -112,7 +112,7 @@ class npc_nether_drake : public CreatureScript public: npc_nether_drake() : CreatureScript("npc_nether_drake") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_nether_drakeAI (creature); } @@ -129,7 +129,7 @@ public: uint32 ManaBurn_Timer; uint32 IntangiblePresence_Timer; - void Reset() + void Reset() OVERRIDE { IsNihil = false; NihilSpeech_Timer = 3000; @@ -140,9 +140,10 @@ public: IntangiblePresence_Timer = 15000; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void MoveInLineOfSight(Unit* who) OVERRIDE - void MoveInLineOfSight(Unit* who) { if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)) return; @@ -151,7 +152,7 @@ public: } //in case Creature was not summoned (not expected) - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -164,7 +165,7 @@ public: } } - void SpellHit(Unit* caster, const SpellInfo* spell) + void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_T_PHASE_MODULATOR && caster->GetTypeId() == TYPEID_PLAYER) { @@ -195,7 +196,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (IsNihil) { @@ -276,7 +277,7 @@ class npc_daranelle : public CreatureScript public: npc_daranelle() : CreatureScript("npc_daranelle") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_daranelleAI (creature); } @@ -285,11 +286,12 @@ public: { npc_daranelleAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() { } + void Reset() OVERRIDE {} + + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void EnterCombat(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* who) OVERRIDE - void MoveInLineOfSight(Unit* who) { if (who->GetTypeId() == TYPEID_PLAYER) { @@ -317,7 +319,7 @@ class npc_overseer_nuaar : public CreatureScript public: npc_overseer_nuaar() : CreatureScript("npc_overseer_nuaar") { } - 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) @@ -328,7 +330,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(10682) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_ON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -351,7 +353,7 @@ class npc_saikkal_the_elder : public CreatureScript public: npc_saikkal_the_elder() : CreatureScript("npc_saikkal_the_elder") { } - 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) @@ -368,7 +370,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(10980) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_STE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -388,7 +390,7 @@ class go_legion_obelisk : public GameObjectScript public: go_legion_obelisk() : GameObjectScript("go_legion_obelisk") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (player->GetQuestStatus(10821) == QUEST_STATUS_INCOMPLETE) { @@ -445,7 +447,7 @@ class npc_bloodmaul_brutebane : public CreatureScript public: npc_bloodmaul_brutebane() : CreatureScript("npc_bloodmaul_brutebane") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_bloodmaul_brutebaneAI(creature); } @@ -463,12 +465,12 @@ public: uint64 OgreGUID; - void Reset() + void Reset() OVERRIDE { OgreGUID = 0; } - void UpdateAI(uint32 /*uiDiff*/) {} + void UpdateAI(uint32 /*uiDiff*/) OVERRIDE {} }; }; @@ -481,7 +483,7 @@ class npc_ogre_brute : public CreatureScript public: npc_ogre_brute() : CreatureScript("npc_ogre_brute") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ogre_bruteAI(creature); } @@ -492,12 +494,13 @@ public: uint64 PlayerGUID; - void Reset() + void Reset() OVERRIDE { PlayerGUID = 0; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!who || (!who->IsAlive())) return; @@ -511,7 +514,7 @@ public: } } - void MovementInform(uint32 /*type*/, uint32 id) + void MovementInform(uint32 /*type*/, uint32 id) OVERRIDE { Player* player = Unit::GetPlayer(*me, PlayerGUID); if (id == 1) @@ -528,7 +531,7 @@ public: } } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!UpdateVictim()) return; @@ -552,7 +555,7 @@ class go_thunderspike : public GameObjectScript public: go_thunderspike() : GameObjectScript("go_thunderspike") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (player->GetQuestStatus(QUEST_THUNDERSPIKE) == QUEST_STATUS_INCOMPLETE && !go->FindNearestCreature(NPC_GOR_GRIMGUT, 25.0f, true)) if (Creature* gorGrimgut = go->SummonCreature(NPC_GOR_GRIMGUT, -2413.4f, 6914.48f, 25.01f, 3.67f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 300000)) @@ -654,7 +657,7 @@ class npc_simon_bunny : public CreatureScript EventMap _events; std::list<uint8> colorSequence, playableSequence, playerSequence; - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { _events.Update(diff); @@ -708,7 +711,7 @@ class npc_simon_bunny : public CreatureScript } } - void DoAction(int32 action) + void DoAction(int32 action) OVERRIDE { switch (action) { @@ -734,7 +737,7 @@ class npc_simon_bunny : public CreatureScript } // Called by color clusters script (go_simon_cluster) and used for knowing the button pressed by player - void SetData(uint32 type, uint32 /*data*/) + void SetData(uint32 type, uint32 /*data*/) OVERRIDE { if (!listening) return; @@ -757,7 +760,7 @@ class npc_simon_bunny : public CreatureScript } // Used for getting involved player guid. Parameter id is used for defining if is a large(Monument) or small(Relic) node - void SetGUID(uint64 guid, int32 id) + void SetGUID(uint64 guid, int32 id) OVERRIDE { me->SetCanFly(true); @@ -1047,7 +1050,7 @@ class npc_simon_bunny : public CreatureScript } } - void SpellHitTarget(Unit* target, const SpellInfo* spell) + void SpellHitTarget(Unit* target, const SpellInfo* spell) OVERRIDE { // Cast SPELL_BAD_PRESS_DAMAGE with scaled basepoints when the visual hits the target. // Need Fix: When SPELL_BAD_PRESS_TRIGGER hits target it triggers spell SPELL_BAD_PRESS_DAMAGE by itself @@ -1079,7 +1082,7 @@ class npc_simon_bunny : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_simon_bunnyAI(creature); } @@ -1090,7 +1093,7 @@ class go_simon_cluster : public GameObjectScript public: go_simon_cluster() : GameObjectScript("go_simon_cluster") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (Creature* bunny = go->FindNearestCreature(NPC_SIMON_BUNNY, 12.0f, true)) bunny->AI()->SetData(go->GetEntry(), 0); @@ -1116,14 +1119,14 @@ class go_apexis_relic : public GameObjectScript public: go_apexis_relic() : GameObjectScript("go_apexis_relic") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { player->PrepareGossipMenu(go, go->GetGOInfo()->questgiver.gossipID); player->SendPreparedGossip(go); return true; } - bool OnGossipSelect(Player* player, GameObject* go, uint32 /*sender*/, uint32 /*action*/) + bool OnGossipSelect(Player* player, GameObject* go, uint32 /*sender*/, uint32 /*action*/) OVERRIDE { player->CLOSE_GOSSIP_MENU(); diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp index 7cbc48966ae..3f1266701db 100644 --- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp @@ -61,7 +61,7 @@ class npc_aeranas : public CreatureScript public: npc_aeranas() : CreatureScript("npc_aeranas") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_aeranasAI (creature); } @@ -74,7 +74,7 @@ public: uint32 EnvelopingWinds_Timer; uint32 Shock_Timer; - void Reset() + void Reset() OVERRIDE { Faction_Timer = 8000; EnvelopingWinds_Timer = 9000; @@ -86,7 +86,7 @@ public: Talk(SAY_SUMMON); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (Faction_Timer) { @@ -148,7 +148,7 @@ class npc_ancestral_wolf : public CreatureScript public: npc_ancestral_wolf() : CreatureScript("npc_ancestral_wolf") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ancestral_wolfAI(creature); } @@ -168,13 +168,14 @@ public: Creature* pRyga; - void Reset() + void Reset() OVERRIDE { pRyga = NULL; DoCast(me, SPELL_ANCESTRAL_WOLF_BUFF, true); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!pRyga && who->GetEntry() == NPC_RYGA && me->IsWithinDistInMap(who, 15.0f)) if (Creature* temp = who->ToCreature()) @@ -183,7 +184,7 @@ public: npc_escortAI::MoveInLineOfSight(who); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -218,7 +219,7 @@ class npc_naladu : public CreatureScript public: npc_naladu() : CreatureScript("npc_naladu") { } - 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) @@ -227,7 +228,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -257,7 +258,7 @@ class npc_tracy_proudwell : public CreatureScript public: npc_tracy_proudwell() : CreatureScript("npc_tracy_proudwell") { } - 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) @@ -277,7 +278,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -313,7 +314,7 @@ class npc_trollbane : public CreatureScript public: npc_trollbane() : CreatureScript("npc_trollbane") { } - 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) @@ -333,7 +334,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -366,7 +367,7 @@ class npc_wounded_blood_elf : public CreatureScript public: npc_wounded_blood_elf() : CreatureScript("npc_wounded_blood_elf") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_ROAD_TO_FALCON_WATCH) { @@ -380,7 +381,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_wounded_blood_elfAI(creature); } @@ -389,7 +390,7 @@ public: { npc_wounded_blood_elfAI(Creature* creature) : npc_escortAI(creature) {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -423,15 +424,15 @@ public: } } - void Reset() { } + void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { if (HasEscortState(STATE_ESCORT_ESCORTING)) Talk(SAY_ELF_AGGRO); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } @@ -454,7 +455,7 @@ class npc_fel_guard_hound : public CreatureScript public: npc_fel_guard_hound() : CreatureScript("npc_fel_guard_hound") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_fel_guard_houndAI(creature); } @@ -466,13 +467,13 @@ public: uint32 uiCheckTimer; uint64 uiHelboarGUID; - void Reset() + void Reset() OVERRIDE { uiCheckTimer = 5000; //check for creature every 5 sec uiHelboarGUID = 0; } - void MovementInform(uint32 uiType, uint32 uiId) + void MovementInform(uint32 uiType, uint32 uiId) OVERRIDE { if (uiType != POINT_MOTION_TYPE || uiId != 1) return; @@ -487,7 +488,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { if (uiCheckTimer <= uiDiff) { diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp index c4b651c22ce..4269c69cfe0 100644 --- a/src/server/scripts/Outland/zone_nagrand.cpp +++ b/src/server/scripts/Outland/zone_nagrand.cpp @@ -60,7 +60,7 @@ class npc_greatmother_geyah : public CreatureScript public: npc_greatmother_geyah() : CreatureScript("npc_greatmother_geyah") { } - 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) @@ -121,7 +121,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -178,7 +178,7 @@ class npc_maghar_captive : public CreatureScript public: npc_maghar_captive() : CreatureScript("npc_maghar_captive") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_TOTEM_KARDASH_H) { @@ -199,7 +199,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_maghar_captiveAI(creature); } @@ -212,19 +212,19 @@ public: uint32 m_uiHealTimer; uint32 m_uiFrostShockTimer; - void Reset() + void Reset() OVERRIDE { m_uiChainLightningTimer = 1000; m_uiHealTimer = 0; m_uiFrostShockTimer = 6000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoCast(me, SPELL_EARTHBIND_TOTEM, false); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -249,7 +249,7 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned->GetEntry() == NPC_MURK_BRUTE) summoned->AI()->Talk(SAY_MAG_NO_ESCAPE); @@ -263,7 +263,7 @@ public: } - void SpellHitTarget(Unit* /*target*/, const SpellInfo* pSpell) + void SpellHitTarget(Unit* /*target*/, const SpellInfo* pSpell) OVERRIDE { if (pSpell->Id == SPELL_CHAIN_LIGHTNING) { @@ -274,7 +274,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { npc_escortAI::UpdateAI(uiDiff); if (!me->GetVictim()) @@ -321,7 +321,7 @@ class npc_creditmarker_visit_with_ancestors : public CreatureScript public: npc_creditmarker_visit_with_ancestors() : CreatureScript("npc_creditmarker_visit_with_ancestors") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_creditmarker_visit_with_ancestorsAI (creature); } @@ -330,11 +330,12 @@ public: { npc_creditmarker_visit_with_ancestorsAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() {} + void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void MoveInLineOfSight(Unit* who) OVERRIDE - void MoveInLineOfSight(Unit* who) { if (!who) return; @@ -384,7 +385,7 @@ class go_corkis_prison : public GameObjectScript public: go_corkis_prison() : GameObjectScript("go_corkis_prison") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { go->SetGoState(GO_STATE_READY); if (go->GetEntry() == GO_CORKIS_PRISON) @@ -425,7 +426,7 @@ class npc_corki : public CreatureScript public: npc_corki() : CreatureScript("npc_corki") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_corkiAI(creature); } @@ -437,13 +438,13 @@ public: uint32 Say_Timer; bool ReleasedFromCage; - void Reset() + void Reset() OVERRIDE { Say_Timer = 5000; ReleasedFromCage = false; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (ReleasedFromCage) { @@ -457,7 +458,7 @@ public: } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type == POINT_MOTION_TYPE && id == 1) { @@ -509,7 +510,7 @@ class npc_kurenai_captive : public CreatureScript public: npc_kurenai_captive() : CreatureScript("npc_kurenai_captive") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_TOTEM_KARDASH_A) { @@ -527,7 +528,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_kurenai_captiveAI(creature); } @@ -540,19 +541,19 @@ public: uint32 HealTimer; uint32 FrostShockTimer; - void Reset() + void Reset() OVERRIDE { ChainLightningTimer = 1000; HealTimer = 0; FrostShockTimer = 6000; } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { DoCast(me, SPELL_KUR_EARTHBIND_TOTEM, false); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (!HasEscortState(STATE_ESCORT_ESCORTING)) return; @@ -564,7 +565,7 @@ public: } } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { switch (waypointId) { @@ -593,7 +594,7 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned->GetEntry() == NPC_KUR_MURK_BRUTE) Talk(SAY_KUR_NO_ESCAPE); @@ -607,7 +608,7 @@ public: summoned->AI()->AttackStart(me); } - void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) + void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) OVERRIDE { if (spell->Id == SPELL_KUR_CHAIN_LIGHTNING) { @@ -626,7 +627,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -677,7 +678,7 @@ class go_warmaul_prison : public GameObjectScript public: go_warmaul_prison() : GameObjectScript("go_warmaul_prison") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { go->UseDoorOrButton(); if (player->GetQuestStatus(QUEST_FINDING_THE_SURVIVORS) != QUEST_STATUS_INCOMPLETE) diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp index a3f959c58b6..553817f01d8 100644 --- a/src/server/scripts/Outland/zone_netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp @@ -74,7 +74,7 @@ class npc_manaforge_control_console : public CreatureScript public: npc_manaforge_control_console() : CreatureScript("npc_manaforge_control_console") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_manaforge_control_consoleAI (creature); } @@ -91,7 +91,7 @@ public: uint64 goConsole; Creature* add; - void Reset() + void Reset() OVERRIDE { Event_Timer = 3000; Wave_Timer = 0; @@ -102,9 +102,9 @@ public: add = NULL; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - /*void SpellHit(Unit* caster, const SpellInfo* spell) + /*void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE { //we have no way of telling the Creature was hit by spell -> got aura applied after 10-12 seconds //then no way for the mobs to actually stop the shutdown as intended. @@ -112,7 +112,7 @@ public: DoSay("Silence! I kill you!", LANG_UNIVERSAL, NULL); }*/ - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { Talk(EMOTE_ABORT); @@ -234,7 +234,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (Event_Timer <= diff) { @@ -311,7 +311,7 @@ class go_manaforge_control_console : public GameObjectScript public: go_manaforge_control_console() : GameObjectScript("go_manaforge_control_console") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (go->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) { @@ -393,7 +393,7 @@ class npc_commander_dawnforge : public CreatureScript public: npc_commander_dawnforge() : CreatureScript("npc_commander_dawnforge") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_commander_dawnforgeAI(creature); } @@ -414,7 +414,7 @@ public: float angle_dawnforge; float angle_ardonis; - void Reset() + void Reset() OVERRIDE { PlayerGUID = 0; ardonisGUID = 0; @@ -426,9 +426,9 @@ public: isEvent = false; } - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { pathaleonGUID = summoned->GetGUID(); } @@ -506,7 +506,7 @@ public: return false; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Is event even running? if (!isEvent) @@ -644,7 +644,7 @@ class at_commander_dawnforge : public AreaTriggerScript public: at_commander_dawnforge() : AreaTriggerScript("at_commander_dawnforge") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) + bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) OVERRIDE { //if player lost aura or not have at all, we should not try start event. if (!player->HasAura(SPELL_SUNFURY_DISGUISE)) @@ -687,7 +687,7 @@ public: //if (quest->GetQuestId() == QUEST_DIMENSIUS) //creature->AI()->Talk(WHISPER_DABIRI, player->GetGUID()); - 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) @@ -699,7 +699,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -739,7 +739,7 @@ class npc_phase_hunter : public CreatureScript public: npc_phase_hunter() : CreatureScript("npc_phase_hunter") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_phase_hunterAI (creature); } @@ -758,7 +758,7 @@ public: uint32 ManaBurnTimer; - void Reset() + void Reset() OVERRIDE { Weak = false; Materialize = false; @@ -773,18 +773,18 @@ public: me->UpdateEntry(NPC_PHASE_HUNTER_ENTRY); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (who->GetTypeId() == TYPEID_PLAYER) PlayerGUID = who->GetGUID(); } - //void SpellHit(Unit* /*caster*/, const SpellInfo* /*spell*/) + //void SpellHit(Unit* /*caster*/, const SpellInfo* /*spell*/) OVERRIDE //{ // DoCast(me, SPELL_DE_MATERIALIZE); //} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!Materialize) { @@ -865,7 +865,7 @@ class npc_bessy : public CreatureScript public: npc_bessy() : CreatureScript("npc_bessy") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == Q_ALMABTRIEB) { @@ -876,7 +876,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_bessyAI(creature); } @@ -885,13 +885,13 @@ public: { npc_bessyAI(Creature* creature) : npc_escortAI(creature) {} - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Player* player = GetPlayerForEscort()) player->FailQuest(Q_ALMABTRIEB); } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -920,12 +920,12 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { summoned->AI()->AttackStart(me); } - void Reset() + void Reset() OVERRIDE { me->RestoreFaction(); } @@ -947,7 +947,7 @@ class npc_maxx_a_million_escort : public CreatureScript public: npc_maxx_a_million_escort() : CreatureScript("npc_maxx_a_million_escort") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_maxx_a_million_escortAI(creature); } @@ -959,13 +959,13 @@ public: bool bTake; uint32 uiTakeTimer; - void Reset() + void Reset() OVERRIDE { bTake=false; uiTakeTimer=3000; } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -991,13 +991,13 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Player* player = GetPlayerForEscort()) player->FailQuest(QUEST_MARK_V_IS_ALIVE); } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { npc_escortAI::UpdateAI(uiDiff); @@ -1021,7 +1021,7 @@ public: } }; - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_MARK_V_IS_ALIVE) { @@ -1050,7 +1050,7 @@ class go_captain_tyralius_prison : public GameObjectScript public: go_captain_tyralius_prison() : GameObjectScript("go_captain_tyralius_prison") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { go->UseDoorOrButton(); if (Creature* tyralius = go->FindNearestCreature(NPC_CAPTAIN_TYRALIUS, 1.0f)) diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index a8fdf3b9034..b7cf46ad8ae 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -73,7 +73,7 @@ class npc_mature_netherwing_drake : public CreatureScript public: npc_mature_netherwing_drake() : CreatureScript("npc_mature_netherwing_drake") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_mature_netherwing_drakeAI(creature); } @@ -90,7 +90,7 @@ public: uint32 EatTimer; uint32 CastTimer; - void Reset() + void Reset() OVERRIDE { uiPlayerGUID = 0; @@ -101,7 +101,7 @@ public: CastTimer = 5000; } - void SpellHit(Unit* pCaster, SpellInfo const* spell) + void SpellHit(Unit* pCaster, SpellInfo const* spell) OVERRIDE { if (bCanEat || bIsEating) return; @@ -113,7 +113,7 @@ public: } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -126,7 +126,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (bCanEat || bIsEating) { @@ -211,7 +211,7 @@ class npc_enslaved_netherwing_drake : public CreatureScript public: npc_enslaved_netherwing_drake() : CreatureScript("npc_enslaved_netherwing_drake") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_enslaved_netherwing_drakeAI(creature); } @@ -229,7 +229,7 @@ public: uint32 FlyTimer; bool Tapped; - void Reset() + void Reset() OVERRIDE { if (!Tapped) me->setFaction(FACTION_DEFAULT); @@ -239,7 +239,7 @@ public: me->SetVisible(true); } - void SpellHit(Unit* caster, const SpellInfo* spell) + void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE { if (!caster) return; @@ -265,7 +265,7 @@ public: } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -287,7 +287,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) { @@ -342,7 +342,7 @@ class npc_dragonmaw_peon : public CreatureScript public: npc_dragonmaw_peon() : CreatureScript("npc_dragonmaw_peon") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_dragonmaw_peonAI(creature); } @@ -355,14 +355,14 @@ public: bool Tapped; uint32 PoisonTimer; - void Reset() + void Reset() OVERRIDE { PlayerGUID = 0; Tapped = false; PoisonTimer = 0; } - void SpellHit(Unit* caster, const SpellInfo* spell) + void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE { if (!caster) return; @@ -380,7 +380,7 @@ public: } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type != POINT_MOTION_TYPE) return; @@ -392,7 +392,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (PoisonTimer) { @@ -421,7 +421,7 @@ class npc_drake_dealer_hurlunk : public CreatureScript public: npc_drake_dealer_hurlunk() : CreatureScript("npc_drake_dealer_hurlunk") { } - 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_TRADE) @@ -430,7 +430,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsVendor() && player->GetReputationRank(1015) == REP_EXALTED) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); @@ -453,7 +453,7 @@ class npcs_flanis_swiftwing_and_kagrosh : public CreatureScript public: npcs_flanis_swiftwing_and_kagrosh() : CreatureScript("npcs_flanis_swiftwing_and_kagrosh") { } - 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) @@ -479,7 +479,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(10583) == QUEST_STATUS_INCOMPLETE && !player->HasItemCount(30658, 1, true)) player->ADD_GOSSIP_ITEM(0, GOSSIP_HSK1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -510,7 +510,7 @@ class npc_murkblood_overseer : public CreatureScript public: npc_murkblood_overseer() : CreatureScript("npc_murkblood_overseer") { } - 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) @@ -550,7 +550,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(QUEST_11082) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(0, GOSSIP_HMO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -577,7 +577,7 @@ class npc_oronok_tornheart : public CreatureScript public: npc_oronok_tornheart() : CreatureScript("npc_oronok_tornheart") { } - 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) @@ -617,7 +617,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -654,7 +654,7 @@ class npc_karynaku : public CreatureScript public: npc_karynaku() : CreatureScript("npc_karynaku") { } - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_ALLY_OF_NETHER) player->ActivateTaxiPathTo(TAXI_PATH_ID); @@ -708,7 +708,7 @@ class npc_overlord_morghor : public CreatureScript public: npc_overlord_morghor() : CreatureScript("npc_overlord_morghor") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest *_Quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest *_Quest) OVERRIDE { if (_Quest->GetQuestId() == QUEST_LORD_ILLIDAN_STORMRAGE) { @@ -719,7 +719,7 @@ public: return false; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_overlord_morghorAI(creature); } @@ -736,7 +736,7 @@ public: bool Event; - void Reset() + void Reset() OVERRIDE { PlayerGUID = 0; IllidanGUID = 0; @@ -969,7 +969,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!ConversationTimer) return; @@ -1012,7 +1012,7 @@ class npc_earthmender_wilda : public CreatureScript public: npc_earthmender_wilda() : CreatureScript("npc_earthmender_wilda") { } - bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) + bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_ESCAPE_COILSCAR) { @@ -1025,7 +1025,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_earthmender_wildaAI(creature); } @@ -1036,12 +1036,12 @@ public: uint32 m_uiHealingTimer; - void Reset() + void Reset() OVERRIDE { m_uiHealingTimer = 0; } - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -1099,7 +1099,7 @@ public: } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) OVERRIDE { if (summoned->GetEntry() == NPC_COILSKAR_ASSASSIN) summoned->AI()->AttackStart(me); @@ -1117,7 +1117,7 @@ public: DoSummon(NPC_COILSKAR_ASSASSIN, me, 15.0f, 5000, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { //don't always use if (rand()%5) @@ -1132,7 +1132,7 @@ public: } } - void UpdateAI(uint32 uiDiff) + void UpdateAI(uint32 uiDiff) OVERRIDE { npc_escortAI::UpdateAI(uiDiff); @@ -1255,7 +1255,7 @@ class npc_torloth_the_magnificent : public CreatureScript public: npc_torloth_the_magnificent() : CreatureScript("npc_torloth_the_magnificent") { } - CreatureAI* GetAI(Creature* c) const + CreatureAI* GetAI(Creature* c) const OVERRIDE { return new npc_torloth_the_magnificentAI(c); } @@ -1273,7 +1273,7 @@ public: bool Timers; - void Reset() + void Reset() OVERRIDE { AnimationTimer = 4000; AnimationCount = 0; @@ -1286,7 +1286,7 @@ public: me->SetTarget(0); } - void EnterCombat(Unit* /*who*/){} + void EnterCombat(Unit* /*who*/)OVERRIDE {} void HandleAnimation() { @@ -1333,7 +1333,7 @@ public: ++AnimationCount; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (AnimationTimer) { @@ -1378,7 +1378,7 @@ public: DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { switch (killer->GetTypeId()) { @@ -1410,7 +1410,7 @@ class npc_lord_illidan_stormrage : public CreatureScript public: npc_lord_illidan_stormrage() : CreatureScript("npc_lord_illidan_stormrage") { } - CreatureAI* GetAI(Creature* c) const + CreatureAI* GetAI(Creature* c) const OVERRIDE { return new npc_lord_illidan_stormrageAI(c); } @@ -1431,7 +1431,7 @@ public: bool Announced; bool Failed; - void Reset() + void Reset() OVERRIDE { PlayerGUID = 0; @@ -1447,9 +1447,10 @@ public: me->SetVisible(false); } - void EnterCombat(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} - void AttackStart(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + + void AttackStart(Unit* /*who*/) OVERRIDE {} void SummonNextWave(); @@ -1520,7 +1521,7 @@ public: Announced = false; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!PlayerGUID || !EventStarted) return; @@ -1558,7 +1559,7 @@ class npc_illidari_spawn : public CreatureScript public: npc_illidari_spawn() : CreatureScript("npc_illidari_spawn") { } - CreatureAI* GetAI(Creature* c) const + CreatureAI* GetAI(Creature* c) const OVERRIDE { return new npc_illidari_spawnAI(c); } @@ -1571,15 +1572,15 @@ public: uint32 SpellTimer1, SpellTimer2, SpellTimer3; bool Timers; - void Reset() + void Reset() OVERRIDE { LordIllidanGUID = 0; Timers = false; } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { me->RemoveCorpse(); if (Creature* LordIllidan = (Unit::GetCreature(*me, LordIllidanGUID))) @@ -1587,7 +1588,7 @@ public: CAST_AI(npc_lord_illidan_stormrage::npc_lord_illidan_stormrageAI, LordIllidan->AI())->LiveCounter(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1744,7 +1745,7 @@ class go_crystal_prison : public GameObjectScript public: go_crystal_prison() : GameObjectScript("go_crystal_prison") { } - bool OnQuestAccept(Player* player, GameObject* /*go*/, Quest const* quest) + bool OnQuestAccept(Player* player, GameObject* /*go*/, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_BATTLE_OF_THE_CRIMSON_WATCH) { @@ -1813,7 +1814,7 @@ class npc_enraged_spirit : public CreatureScript public: npc_enraged_spirit() : CreatureScript("npc_enraged_spirit") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_enraged_spiritAI(creature); } @@ -1822,11 +1823,11 @@ public: { npc_enraged_spiritAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() { } + void Reset() OVERRIDE {} - void EnterCombat(Unit* /*who*/){} + void EnterCombat(Unit* /*who*/)OVERRIDE {} - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { // always spawn spirit on death // if totem around @@ -1908,13 +1909,13 @@ class spell_unlocking_zuluheds_chains : public SpellScriptLoader GetCaster()->ToPlayer()->CastedCreatureOrGO(NPC_KARYNAKU, karynaku->GetGUID(), GetSpellInfo()->Id); } - void Register() + void Register() OVERRIDE { AfterHit += SpellHitFn(spell_unlocking_zuluheds_chains_SpellScript::HandleAfterHit); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_unlocking_zuluheds_chains_SpellScript(); } @@ -1942,14 +1943,14 @@ public: { npc_shadowmoon_tuber_nodeAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { tapped = false; tuberGUID = 0; resetTimer = 60000; } - void SetData(uint32 id, uint32 data) + void SetData(uint32 id, uint32 data) OVERRIDE { if (id == TYPE_BOAR && data == DATA_BOAR) { @@ -1966,7 +1967,7 @@ public: } } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) OVERRIDE { if (!tapped && spell->Id == SPELL_WHISTLE) { @@ -1980,7 +1981,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (tapped) { @@ -2004,7 +2005,7 @@ public: uint32 resetTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_shadowmoon_tuber_nodeAI(creature); } diff --git a/src/server/scripts/Outland/zone_shattrath_city.cpp b/src/server/scripts/Outland/zone_shattrath_city.cpp index 0241a5cb4ed..a391ec03228 100644 --- a/src/server/scripts/Outland/zone_shattrath_city.cpp +++ b/src/server/scripts/Outland/zone_shattrath_city.cpp @@ -58,7 +58,7 @@ class npc_raliq_the_drunk : public CreatureScript public: npc_raliq_the_drunk() : CreatureScript("npc_raliq_the_drunk") { } - 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) @@ -70,7 +70,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(QUEST_CRACK_SKULLS) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_RALIQ, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -79,7 +79,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_raliq_the_drunkAI (creature); } @@ -94,13 +94,13 @@ public: uint32 m_uiNormFaction; uint32 Uppercut_Timer; - void Reset() + void Reset() OVERRIDE { Uppercut_Timer = 5000; me->RestoreFaction(); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -139,7 +139,7 @@ class npc_salsalabim : public CreatureScript public: npc_salsalabim() : CreatureScript("npc_salsalabim") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(QUEST_10004) == QUEST_STATUS_INCOMPLETE) { @@ -155,7 +155,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_salsalabimAI (creature); } @@ -166,13 +166,13 @@ public: uint32 MagneticPull_Timer; - void Reset() + void Reset() OVERRIDE { MagneticPull_Timer = 15000; me->RestoreFaction(); } - void DamageTaken(Unit* done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE { if (done_by->GetTypeId() == TYPEID_PLAYER && me->HealthBelowPctDamaged(20, damage)) { @@ -182,7 +182,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -214,7 +214,7 @@ class npc_shattrathflaskvendors : public CreatureScript public: npc_shattrathflaskvendors() : CreatureScript("npc_shattrathflaskvendors") { } - 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_TRADE) @@ -223,7 +223,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->GetEntry() == 23484) { @@ -268,7 +268,7 @@ class npc_zephyr : public CreatureScript public: npc_zephyr() : CreatureScript("npc_zephyr") { } - 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) @@ -277,7 +277,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetReputationRank(989) >= REP_REVERED) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HZ, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -323,7 +323,7 @@ class npc_kservant : public CreatureScript public: npc_kservant() : CreatureScript("npc_kservant") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_kservantAI(creature); } @@ -333,7 +333,7 @@ public: public: npc_kservantAI(Creature* creature) : npc_escortAI(creature) {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -411,7 +411,8 @@ public: } } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (HasEscortState(STATE_ESCORT_ESCORTING)) return; @@ -427,7 +428,7 @@ public: } } - void Reset() { } + void Reset() OVERRIDE {} }; }; @@ -443,7 +444,7 @@ class npc_ishanah : public CreatureScript public: npc_ishanah() : CreatureScript("npc_ishanah") { } - 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) @@ -454,7 +455,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -484,7 +485,7 @@ class npc_khadgar : public CreatureScript public: npc_khadgar() : CreatureScript("npc_khadgar") { } - 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) @@ -521,7 +522,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); diff --git a/src/server/scripts/Outland/zone_terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp index 45ff3477307..34763d8946c 100644 --- a/src/server/scripts/Outland/zone_terokkar_forest.cpp +++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp @@ -61,7 +61,7 @@ class npc_unkor_the_ruthless : public CreatureScript public: npc_unkor_the_ruthless() : CreatureScript("npc_unkor_the_ruthless") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_unkor_the_ruthlessAI (creature); } @@ -74,7 +74,7 @@ public: uint32 UnkorUnfriendly_Timer; uint32 Pulverize_Timer; - void Reset() + void Reset() OVERRIDE { CanDoQuest = false; UnkorUnfriendly_Timer = 0; @@ -83,7 +83,7 @@ public: me->setFaction(FACTION_HOSTILE); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} void DoNice() { @@ -96,7 +96,7 @@ public: UnkorUnfriendly_Timer = 60000; } - void DamageTaken(Unit* done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE { Player* player = done_by->ToPlayer(); @@ -126,7 +126,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (CanDoQuest) { @@ -168,7 +168,7 @@ class npc_infested_root_walker : public CreatureScript public: npc_infested_root_walker() : CreatureScript("npc_infested_root_walker") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_infested_root_walkerAI (creature); } @@ -177,10 +177,10 @@ public: { npc_infested_root_walkerAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() { } - void EnterCombat(Unit* /*who*/) { } + void Reset() OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void DamageTaken(Unit* done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE { if (done_by && done_by->GetTypeId() == TYPEID_PLAYER) if (me->GetHealth() <= damage) @@ -199,7 +199,7 @@ class npc_skywing : public CreatureScript public: npc_skywing() : CreatureScript("npc_skywing") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_skywingAI(creature); } @@ -209,7 +209,7 @@ public: public: npc_skywingAI(Creature* creature) : npc_escortAI(creature) {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -223,9 +223,10 @@ public: } } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + + void MoveInLineOfSight(Unit* who) OVERRIDE - void MoveInLineOfSight(Unit* who) { if (HasEscortState(STATE_ESCORT_ESCORTING)) return; @@ -236,9 +237,9 @@ public: Start(false, false, who->GetGUID()); } - void Reset() { } + void Reset() OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { npc_escortAI::UpdateAI(diff); } @@ -254,7 +255,7 @@ class npc_rotting_forest_rager : public CreatureScript public: npc_rotting_forest_rager() : CreatureScript("npc_rotting_forest_rager") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_rotting_forest_ragerAI (creature); } @@ -263,10 +264,10 @@ public: { npc_rotting_forest_ragerAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() { } - void EnterCombat(Unit* /*who*/) { } + void Reset() OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void DamageTaken(Unit* done_by, uint32 &damage) + void DamageTaken(Unit* done_by, uint32 &damage) OVERRIDE { if (done_by->GetTypeId() == TYPEID_PLAYER) if (me->GetHealth() <= damage) @@ -297,7 +298,7 @@ class npc_netherweb_victim : public CreatureScript public: npc_netherweb_victim() : CreatureScript("npc_netherweb_victim") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_netherweb_victimAI (creature); } @@ -306,11 +307,12 @@ public: { npc_netherweb_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) @@ -359,7 +361,7 @@ class npc_floon : public CreatureScript public: npc_floon() : CreatureScript("npc_floon") { } - 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) @@ -377,7 +379,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(QUEST_CRACK_SKULLS) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FLOON1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); @@ -386,7 +388,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_floonAI (creature); } @@ -403,7 +405,7 @@ public: uint32 Frostbolt_Timer; uint32 FrostNova_Timer; - void Reset() + void Reset() OVERRIDE { Silence_Timer = 2000; Frostbolt_Timer = 4000; @@ -412,9 +414,9 @@ public: me->setFaction(m_uiNormFaction); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -467,7 +469,7 @@ public: { npc_isla_starmaneAI(Creature* creature) : npc_escortAI(creature) {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -506,12 +508,12 @@ public: } } - void Reset() + void Reset() OVERRIDE { me->RestoreFaction(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (Player* player = GetPlayerForEscort()) { @@ -523,7 +525,7 @@ public: } }; - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_EFTW_H || quest->GetQuestId() == QUEST_EFTW_A) { @@ -533,7 +535,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_isla_starmaneAI(creature); } @@ -552,7 +554,7 @@ class go_skull_pile : public GameObjectScript public: go_skull_pile() : GameObjectScript("go_skull_pile") { } - bool OnGossipSelect(Player* player, GameObject* go, uint32 sender, uint32 action) + bool OnGossipSelect(Player* player, GameObject* go, uint32 sender, uint32 action) OVERRIDE { player->PlayerTalkClass->ClearMenus(); switch (sender) @@ -562,7 +564,7 @@ public: return true; } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if ((player->GetQuestStatus(11885) == QUEST_STATUS_INCOMPLETE) || player->GetQuestRewardStatus(11885)) { @@ -610,7 +612,7 @@ class npc_slim : public CreatureScript public: npc_slim() : CreatureScript("npc_slim") { } - 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_TRADE) @@ -619,7 +621,7 @@ public: return true; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsVendor() && player->GetReputationRank(FACTION_CONSORTIUM) >= REP_FRIENDLY) { @@ -648,7 +650,7 @@ class npc_akuno : public CreatureScript public: npc_akuno() : CreatureScript("npc_akuno") { } - 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_TOMB) { @@ -663,7 +665,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_akunoAI(creature); } @@ -672,7 +674,7 @@ public: { npc_akunoAI(Creature* creature) : npc_escortAI(creature) {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -691,7 +693,7 @@ public: } } - void JustSummoned(Creature* summon) + void JustSummoned(Creature* summon) OVERRIDE { summon->AI()->AttackStart(me); } diff --git a/src/server/scripts/Outland/zone_zangarmarsh.cpp b/src/server/scripts/Outland/zone_zangarmarsh.cpp index 9a70896f44b..8bacc778f4b 100644 --- a/src/server/scripts/Outland/zone_zangarmarsh.cpp +++ b/src/server/scripts/Outland/zone_zangarmarsh.cpp @@ -69,7 +69,7 @@ class npcs_ashyen_and_keleth : public CreatureScript public: npcs_ashyen_and_keleth() : CreatureScript("npcs_ashyen_and_keleth") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetReputationRank(942) > REP_NEUTRAL) { @@ -84,7 +84,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) @@ -183,16 +183,16 @@ public: uint32 m_uiNormFaction; uint32 LightningBolt_Timer; - void Reset() + void Reset() OVERRIDE { LightningBolt_Timer = 2000; if (me->getFaction() != m_uiNormFaction) me->setFaction(m_uiNormFaction); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -207,12 +207,12 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_cooshcooshAI (creature); } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(QUEST_CRACK_SKULLS) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_COOSH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); @@ -221,7 +221,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) @@ -247,7 +247,7 @@ class npc_elder_kuruti : public CreatureScript public: npc_elder_kuruti() : CreatureScript("npc_elder_kuruti") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(9803) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KUR1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); @@ -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) @@ -300,7 +300,7 @@ class npc_mortog_steamhead : public CreatureScript public: npc_mortog_steamhead() : CreatureScript("npc_mortog_steamhead") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsVendor() && player->GetReputationRank(942) == REP_EXALTED) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); @@ -310,7 +310,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_TRADE) @@ -344,9 +344,9 @@ public: { npc_kayra_longmaneAI(Creature* creature) : npc_escortAI(creature) {} - void Reset() { } + void Reset() OVERRIDE {} - void WaypointReached(uint32 waypointId) + void WaypointReached(uint32 waypointId) OVERRIDE { Player* player = GetPlayerForEscort(); if (!player) @@ -379,7 +379,7 @@ public: } }; - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_ESCAPE_FROM) { @@ -391,7 +391,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_kayra_longmaneAI(creature); } @@ -414,7 +414,7 @@ class npc_timothy_daniels : public CreatureScript public: npc_timothy_daniels() : CreatureScript("npc_timothy_daniels") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -427,7 +427,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) diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index 1d653656a8e..0399134fddb 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -68,7 +68,7 @@ class spell_dk_anti_magic_shell_raid : public SpellScriptLoader uint32 absorbPct; - bool Load() + bool Load() OVERRIDE { absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster()); return true; @@ -85,14 +85,14 @@ class spell_dk_anti_magic_shell_raid : public SpellScriptLoader absorbAmount = CalculatePct(dmgInfo.GetDamage(), absorbPct); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_anti_magic_shell_raid_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_dk_anti_magic_shell_raid_AuraScript::Absorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_anti_magic_shell_raid_AuraScript(); } @@ -109,14 +109,14 @@ class spell_dk_anti_magic_shell_self : public SpellScriptLoader PrepareAuraScript(spell_dk_anti_magic_shell_self_AuraScript); uint32 absorbPct, hpPct; - bool Load() + bool Load() OVERRIDE { absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster()); hpPct = GetSpellInfo()->Effects[EFFECT_1].CalcValue(GetCaster()); return true; } - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DK_RUNIC_POWER_ENERGIZE)) return false; @@ -142,7 +142,7 @@ class spell_dk_anti_magic_shell_self : public SpellScriptLoader target->CastCustomSpell(target, SPELL_DK_RUNIC_POWER_ENERGIZE, &bp, NULL, NULL, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_anti_magic_shell_self_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_dk_anti_magic_shell_self_AuraScript::Absorb, EFFECT_0); @@ -150,7 +150,7 @@ class spell_dk_anti_magic_shell_self : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_anti_magic_shell_self_AuraScript(); } @@ -168,13 +168,13 @@ class spell_dk_anti_magic_zone : public SpellScriptLoader uint32 absorbPct; - bool Load() + bool Load() OVERRIDE { absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster()); return true; } - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DK_ANTI_MAGIC_SHELL_TALENT)) return false; @@ -194,14 +194,14 @@ class spell_dk_anti_magic_zone : public SpellScriptLoader absorbAmount = CalculatePct(dmgInfo.GetDamage(), absorbPct); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_anti_magic_zone_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_dk_anti_magic_zone_AuraScript::Absorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_anti_magic_zone_AuraScript(); } @@ -217,14 +217,14 @@ class spell_dk_blood_boil : public SpellScriptLoader { PrepareSpellScript(spell_dk_blood_boil_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DK_BLOOD_BOIL_TRIGGERED)) return false; return true; } - bool Load() + bool Load() OVERRIDE { _executed = false; return GetCaster()->GetTypeId() == TYPEID_PLAYER && GetCaster()->getClass() == CLASS_DEATH_KNIGHT; @@ -239,7 +239,7 @@ class spell_dk_blood_boil : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_DK_BLOOD_BOIL_TRIGGERED, true); } - void Register() + void Register() OVERRIDE { AfterHit += SpellHitFn(spell_dk_blood_boil_SpellScript::HandleAfterHit); } @@ -247,7 +247,7 @@ class spell_dk_blood_boil : public SpellScriptLoader bool _executed; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dk_blood_boil_SpellScript(); } @@ -263,14 +263,14 @@ class spell_dk_blood_gorged : public SpellScriptLoader { PrepareAuraScript(spell_dk_blood_gorged_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DK_BLOOD_GORGED_HEAL)) return false; return true; } - bool Load() + bool Load() OVERRIDE { _procTarget = NULL; return true; @@ -289,7 +289,7 @@ class spell_dk_blood_gorged : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_DK_BLOOD_GORGED_HEAL, SPELLVALUE_BASE_POINT0, bp, _procTarget, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_dk_blood_gorged_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_dk_blood_gorged_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); @@ -299,7 +299,7 @@ class spell_dk_blood_gorged : public SpellScriptLoader Unit* _procTarget; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_blood_gorged_AuraScript(); } @@ -315,7 +315,7 @@ class spell_dk_corpse_explosion : public SpellScriptLoader { PrepareSpellScript(spell_dk_corpse_explosion_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DK_CORPSE_EXPLOSION_TRIGGERED) || !sSpellMgr->GetSpellInfo(SPELL_DK_GHOUL_EXPLODE)) return false; @@ -346,13 +346,13 @@ class spell_dk_corpse_explosion : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_dk_corpse_explosion_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dk_corpse_explosion_SpellScript(); } @@ -368,7 +368,7 @@ class spell_dk_death_coil : public SpellScriptLoader { PrepareSpellScript(spell_dk_death_coil_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DK_DEATH_COIL_DAMAGE) || !sSpellMgr->GetSpellInfo(SPELL_DK_DEATH_COIL_HEAL)) return false; @@ -412,14 +412,14 @@ class spell_dk_death_coil : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_dk_death_coil_SpellScript::CheckCast); OnEffectHitTarget += SpellEffectFn(spell_dk_death_coil_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dk_death_coil_SpellScript(); } @@ -453,14 +453,14 @@ class spell_dk_death_gate : public SpellScriptLoader target->CastSpell(target, GetEffectValue(), false); } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_dk_death_gate_SpellScript::CheckClass); OnEffectHitTarget += SpellEffectFn(spell_dk_death_gate_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dk_death_gate_SpellScript(); } @@ -487,14 +487,14 @@ class spell_dk_death_grip : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_dk_death_grip_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dk_death_grip_SpellScript(); } @@ -543,14 +543,14 @@ class spell_dk_death_pact : public SpellScriptLoader targetList.push_back(target); } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_dk_death_pact_SpellScript::CheckCast); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dk_death_pact_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ALLY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dk_death_pact_SpellScript(); } @@ -566,7 +566,7 @@ class spell_dk_death_strike : public SpellScriptLoader { PrepareSpellScript(spell_dk_death_strike_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DK_DEATH_STRIKE_HEAL)) return false; @@ -587,14 +587,14 @@ class spell_dk_death_strike : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_dk_death_strike_SpellScript::HandleDummy, EFFECT_2, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dk_death_strike_SpellScript(); } @@ -610,7 +610,7 @@ class spell_dk_ghoul_explode : public SpellScriptLoader { PrepareSpellScript(spell_dk_ghoul_explode_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DK_CORPSE_EXPLOSION_TRIGGERED)) return false; @@ -626,13 +626,13 @@ class spell_dk_ghoul_explode : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_dk_ghoul_explode_SpellScript::Suicide, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dk_ghoul_explode_SpellScript(); } @@ -648,7 +648,7 @@ class spell_dk_icebound_fortitude : public SpellScriptLoader { PrepareAuraScript(spell_dk_icebound_fortitude_AuraScript); - bool Load() + bool Load() OVERRIDE { Unit* caster = GetCaster(); return caster && caster->GetTypeId() == TYPEID_PLAYER; @@ -675,13 +675,13 @@ class spell_dk_icebound_fortitude : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_icebound_fortitude_AuraScript::CalculateAmount, EFFECT_2, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_icebound_fortitude_AuraScript(); } @@ -697,7 +697,7 @@ class spell_dk_improved_blood_presence : public SpellScriptLoader { PrepareAuraScript(spell_dk_improved_blood_presence_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DK_BLOOD_PRESENCE) || !sSpellMgr->GetSpellInfo(SPELL_DK_IMPROVED_BLOOD_PRESENCE_TRIGGERED)) return false; @@ -721,14 +721,14 @@ class spell_dk_improved_blood_presence : public SpellScriptLoader target->RemoveAura(SPELL_DK_IMPROVED_BLOOD_PRESENCE_TRIGGERED); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_dk_improved_blood_presence_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_dk_improved_blood_presence_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_improved_blood_presence_AuraScript(); } @@ -744,7 +744,7 @@ class spell_dk_improved_unholy_presence : public SpellScriptLoader { PrepareAuraScript(spell_dk_improved_unholy_presence_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DK_UNHOLY_PRESENCE) || !sSpellMgr->GetSpellInfo(SPELL_DK_IMPROVED_UNHOLY_PRESENCE_TRIGGERED)) return false; @@ -767,14 +767,14 @@ class spell_dk_improved_unholy_presence : public SpellScriptLoader GetTarget()->RemoveAura(SPELL_DK_IMPROVED_UNHOLY_PRESENCE_TRIGGERED); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_dk_improved_unholy_presence_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_dk_improved_unholy_presence_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_improved_unholy_presence_AuraScript(); } @@ -795,13 +795,13 @@ class spell_dk_rune_tap_party : public SpellScriptLoader targets.remove(GetCaster()); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dk_rune_tap_party_SpellScript::CheckTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_PARTY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dk_rune_tap_party_SpellScript(); } @@ -818,13 +818,13 @@ class spell_dk_scourge_strike : public SpellScriptLoader PrepareSpellScript(spell_dk_scourge_strike_SpellScript); float multiplier; - bool Load() + bool Load() OVERRIDE { multiplier = 1.0f; return true; } - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DK_SCOURGE_STRIKE_TRIGGERED)) return false; @@ -857,14 +857,14 @@ class spell_dk_scourge_strike : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_dk_scourge_strike_SpellScript::HandleDummy, EFFECT_2, SPELL_EFFECT_DUMMY); AfterHit += SpellHitFn(spell_dk_scourge_strike_SpellScript::HandleAfterHit); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dk_scourge_strike_SpellScript(); } @@ -882,7 +882,7 @@ class spell_dk_spell_deflection : public SpellScriptLoader uint32 absorbPct; - bool Load() + bool Load() OVERRIDE { absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster()); return true; @@ -901,14 +901,14 @@ class spell_dk_spell_deflection : public SpellScriptLoader absorbAmount = CalculatePct(dmgInfo.GetDamage(), absorbPct); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_spell_deflection_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_dk_spell_deflection_AuraScript::Absorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_spell_deflection_AuraScript(); } @@ -929,13 +929,13 @@ class spell_dk_vampiric_blood : public SpellScriptLoader amount = GetUnitOwner()->CountPctFromMaxHealth(amount); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_vampiric_blood_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_INCREASE_HEALTH); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_vampiric_blood_AuraScript(); } @@ -951,7 +951,7 @@ class spell_dk_will_of_the_necropolis : public SpellScriptLoader { PrepareAuraScript(spell_dk_will_of_the_necropolis_AuraScript); - bool Validate(SpellInfo const* spellInfo) + bool Validate(SpellInfo const* spellInfo) OVERRIDE { // can't use other spell than will of the necropolis due to spell_ranks dependency if (sSpellMgr->GetFirstSpellInChain(SPELL_DK_WILL_OF_THE_NECROPOLIS_AURA_R1) != sSpellMgr->GetFirstSpellInChain(spellInfo->Id)) @@ -966,7 +966,7 @@ class spell_dk_will_of_the_necropolis : public SpellScriptLoader uint32 absorbPct; - bool Load() + bool Load() OVERRIDE { absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster()); return true; @@ -992,14 +992,14 @@ class spell_dk_will_of_the_necropolis : public SpellScriptLoader absorbAmount = CalculatePct(dmgInfo.GetDamage(), absorbPct); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_will_of_the_necropolis_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_dk_will_of_the_necropolis_AuraScript::Absorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_will_of_the_necropolis_AuraScript(); } diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index 160f14ff670..40b33c13a40 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -63,13 +63,13 @@ class spell_dru_dash : public SpellScriptLoader amount = 0; } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_dash_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_INCREASE_SPEED); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_dash_AuraScript(); } @@ -91,13 +91,13 @@ class spell_dru_enrage : public SpellScriptLoader GetHitUnit()->CastCustomSpell(SPELL_DRUID_ENRAGE_MOD_DAMAGE, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), GetHitUnit(), true); } - void Register() + void Register() OVERRIDE { AfterHit += SpellHitFn(spell_dru_enrage_SpellScript::OnHit); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dru_enrage_SpellScript(); } @@ -113,7 +113,7 @@ class spell_dru_glyph_of_starfire : public SpellScriptLoader { PrepareSpellScript(spell_dru_glyph_of_starfire_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DRUID_INCREASED_MOONFIRE_DURATION) || !sSpellMgr->GetSpellInfo(SPELL_DRUID_NATURES_SPLENDOR)) return false; @@ -143,13 +143,13 @@ class spell_dru_glyph_of_starfire : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_dru_glyph_of_starfire_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dru_glyph_of_starfire_SpellScript(); } @@ -179,13 +179,13 @@ class spell_dru_idol_lifebloom : public SpellScriptLoader spellMod->value = aurEff->GetAmount() / 7; } - void Register() + void Register() OVERRIDE { DoEffectCalcSpellMod += AuraEffectCalcSpellModFn(spell_dru_idol_lifebloom_AuraScript::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_idol_lifebloom_AuraScript(); } @@ -206,13 +206,13 @@ class spell_dru_innervate : public SpellScriptLoader amount = CalculatePct(int32(GetUnitOwner()->GetCreatePowers(POWER_MANA) / aurEff->GetTotalTicks()), amount); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_innervate_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_ENERGIZE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_innervate_AuraScript(); } @@ -235,13 +235,13 @@ class spell_dru_insect_swarm : public SpellScriptLoader amount += relicAurEff->GetAmount() / aurEff->GetTotalTicks(); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_insect_swarm_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_insect_swarm_AuraScript(); } @@ -257,7 +257,7 @@ class spell_dru_lifebloom : public SpellScriptLoader { PrepareAuraScript(spell_dru_lifebloom_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DRUID_LIFEBLOOM_FINAL_HEAL)) return false; @@ -316,14 +316,14 @@ class spell_dru_lifebloom : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_dru_lifebloom_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); AfterDispel += AuraDispelFn(spell_dru_lifebloom_AuraScript::HandleDispel); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_lifebloom_AuraScript(); } @@ -339,7 +339,7 @@ class spell_dru_living_seed : public SpellScriptLoader { PrepareAuraScript(spell_dru_living_seed_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DRUID_LIVING_SEED_PROC)) return false; @@ -353,13 +353,13 @@ class spell_dru_living_seed : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_DRUID_LIVING_SEED_PROC, SPELLVALUE_BASE_POINT0, amount, eventInfo.GetProcTarget(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { OnEffectProc += AuraEffectProcFn(spell_dru_living_seed_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_living_seed_AuraScript(); } @@ -375,7 +375,7 @@ class spell_dru_living_seed_proc : public SpellScriptLoader { PrepareAuraScript(spell_dru_living_seed_proc_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DRUID_LIVING_SEED_HEAL)) return false; @@ -388,13 +388,13 @@ class spell_dru_living_seed_proc : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_DRUID_LIVING_SEED_HEAL, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), GetTarget(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { OnEffectProc += AuraEffectProcFn(spell_dru_living_seed_proc_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_living_seed_proc_AuraScript(); } @@ -412,7 +412,7 @@ class spell_dru_moonkin_form_passive : public SpellScriptLoader uint32 absorbPct; - bool Load() + bool Load() OVERRIDE { absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster()); return true; @@ -431,14 +431,14 @@ class spell_dru_moonkin_form_passive : public SpellScriptLoader absorbAmount = CalculatePct(dmgInfo.GetDamage(), absorbPct); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_moonkin_form_passive_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_dru_moonkin_form_passive_AuraScript::Absorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_moonkin_form_passive_AuraScript(); } @@ -459,13 +459,13 @@ class spell_dru_owlkin_frenzy : public SpellScriptLoader amount = CalculatePct(GetUnitOwner()->GetCreatePowers(POWER_MANA), amount); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_owlkin_frenzy_AuraScript::CalculateAmount, EFFECT_2, SPELL_AURA_PERIODIC_ENERGIZE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_owlkin_frenzy_AuraScript(); } @@ -487,14 +487,14 @@ class spell_dru_predatory_strikes : public SpellScriptLoader target->UpdateAttackPowerAndDamage(); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_dru_predatory_strikes_AuraScript::UpdateAmount, EFFECT_ALL, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); AfterEffectRemove += AuraEffectRemoveFn(spell_dru_predatory_strikes_AuraScript::UpdateAmount, EFFECT_ALL, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_predatory_strikes_AuraScript(); } @@ -512,7 +512,7 @@ class spell_dru_primal_tenacity : public SpellScriptLoader uint32 absorbPct; - bool Load() + bool Load() OVERRIDE { absorbPct = GetSpellInfo()->Effects[EFFECT_1].CalcValue(GetCaster()); return true; @@ -531,14 +531,14 @@ class spell_dru_primal_tenacity : public SpellScriptLoader absorbAmount = CalculatePct(dmgInfo.GetDamage(), absorbPct); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_primal_tenacity_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_dru_primal_tenacity_AuraScript::Absorb, EFFECT_1); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_primal_tenacity_AuraScript(); } @@ -554,7 +554,7 @@ class spell_dru_rip : public SpellScriptLoader { PrepareAuraScript(spell_dru_rip_AuraScript); - bool Load() + bool Load() OVERRIDE { Unit* caster = GetCaster(); return caster && caster->GetTypeId() == TYPEID_PLAYER; @@ -580,13 +580,13 @@ class spell_dru_rip : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_rip_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_rip_AuraScript(); } @@ -604,7 +604,7 @@ class spell_dru_savage_defense : public SpellScriptLoader uint32 absorbPct; - bool Load() + bool Load() OVERRIDE { absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster()); return true; @@ -622,14 +622,14 @@ class spell_dru_savage_defense : public SpellScriptLoader aurEff->SetAmount(0); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_savage_defense_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_dru_savage_defense_AuraScript::Absorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_savage_defense_AuraScript(); } @@ -654,7 +654,7 @@ class spell_dru_savage_roar : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_dru_savage_roar_SpellScript::CheckCast); } @@ -664,7 +664,7 @@ class spell_dru_savage_roar : public SpellScriptLoader { PrepareAuraScript(spell_dru_savage_roar_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DRUID_SAVAGE_ROAR)) return false; @@ -682,19 +682,19 @@ class spell_dru_savage_roar : public SpellScriptLoader GetTarget()->RemoveAurasDueToSpell(SPELL_DRUID_SAVAGE_ROAR); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_dru_savage_roar_AuraScript::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_dru_savage_roar_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dru_savage_roar_SpellScript(); } - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_savage_roar_AuraScript(); } @@ -715,13 +715,13 @@ class spell_dru_starfall_aoe : public SpellScriptLoader targets.remove(GetExplTargetUnit()); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dru_starfall_aoe_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dru_starfall_aoe_SpellScript(); } @@ -760,14 +760,14 @@ class spell_dru_starfall_dummy : public SpellScriptLoader caster->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dru_starfall_dummy_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnEffectHitTarget += SpellEffectFn(spell_dru_starfall_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dru_starfall_dummy_SpellScript(); } @@ -792,7 +792,7 @@ class spell_dru_survival_instincts : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_dru_survival_instincts_SpellScript::CheckCast); } @@ -802,7 +802,7 @@ class spell_dru_survival_instincts : public SpellScriptLoader { PrepareAuraScript(spell_dru_survival_instincts_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DRUID_SURVIVAL_INSTINCTS)) return false; @@ -821,19 +821,19 @@ class spell_dru_survival_instincts : public SpellScriptLoader GetTarget()->RemoveAurasDueToSpell(SPELL_DRUID_SURVIVAL_INSTINCTS); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_dru_survival_instincts_AuraScript::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); AfterEffectRemove += AuraEffectRemoveFn(spell_dru_survival_instincts_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dru_survival_instincts_SpellScript(); } - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_survival_instincts_AuraScript(); } @@ -849,7 +849,7 @@ class spell_dru_swift_flight_passive : public SpellScriptLoader { PrepareAuraScript(spell_dru_swift_flight_passive_AuraScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -861,13 +861,13 @@ class spell_dru_swift_flight_passive : public SpellScriptLoader amount = 310; } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_swift_flight_passive_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_INCREASE_VEHICLE_FLIGHT_SPEED); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_swift_flight_passive_AuraScript(); } @@ -889,13 +889,13 @@ class spell_dru_tiger_s_fury : public SpellScriptLoader GetHitUnit()->CastCustomSpell(SPELL_DRUID_TIGER_S_FURY_ENERGIZE, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), GetHitUnit(), true); } - void Register() + void Register() OVERRIDE { AfterHit += SpellHitFn(spell_dru_tiger_s_fury_SpellScript::OnHit); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dru_tiger_s_fury_SpellScript(); } @@ -918,13 +918,13 @@ class spell_dru_typhoon : public SpellScriptLoader PreventHitDefaultEffect(effIndex); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_dru_typhoon_SpellScript::HandleKnockBack, EFFECT_0, SPELL_EFFECT_KNOCK_BACK); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dru_typhoon_SpellScript(); } @@ -940,7 +940,7 @@ class spell_dru_t10_restoration_4p_bonus : public SpellScriptLoader { PrepareSpellScript(spell_dru_t10_restoration_4p_bonus_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -973,13 +973,13 @@ class spell_dru_t10_restoration_4p_bonus : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dru_t10_restoration_4p_bonus_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dru_t10_restoration_4p_bonus_SpellScript(); } diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 25a969c788e..e1928060100 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -48,7 +48,7 @@ class spell_gen_absorb0_hitlimit1 : public SpellScriptLoader uint32 limit; - bool Load() + bool Load() OVERRIDE { // Max absorb stored in 1 dummy effect limit = GetSpellInfo()->Effects[EFFECT_1].CalcValue(); @@ -60,13 +60,13 @@ class spell_gen_absorb0_hitlimit1 : public SpellScriptLoader absorbAmount = std::min(limit, absorbAmount); } - void Register() + void Register() OVERRIDE { OnEffectAbsorb += AuraEffectAbsorbFn(spell_gen_absorb0_hitlimit1_AuraScript::Absorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_absorb0_hitlimit1_AuraScript(); } @@ -91,7 +91,7 @@ class spell_gen_adaptive_warding : public SpellScriptLoader { PrepareAuraScript(spell_gen_adaptive_warding_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_GEN_ADAPTIVE_WARDING_FIRE) || !sSpellMgr->GetSpellInfo(SPELL_GEN_ADAPTIVE_WARDING_NATURE) || @@ -150,14 +150,14 @@ class spell_gen_adaptive_warding : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), spellId, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_gen_adaptive_warding_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_gen_adaptive_warding_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_adaptive_warding_AuraScript(); } @@ -180,13 +180,13 @@ class spell_gen_aura_of_anger : public SpellScriptLoader aurEff->SetAmount(100 * aurEff->GetTickNumber()); } - void Register() + void Register() OVERRIDE { OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_gen_aura_of_anger_AuraScript::HandleEffectPeriodicUpdate, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_aura_of_anger_AuraScript(); } @@ -223,13 +223,13 @@ class spell_gen_av_drekthar_presence : public SpellScriptLoader break; } } - void Register() + void Register() OVERRIDE { DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_gen_av_drekthar_presence_AuraScript::CheckAreaTarget); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_av_drekthar_presence_AuraScript(); } @@ -251,13 +251,13 @@ class spell_gen_burn_brutallus : public SpellScriptLoader aurEff->SetAmount(aurEff->GetAmount() * 2); } - void Register() + void Register() OVERRIDE { OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_gen_burn_brutallus_AuraScript::HandleEffectPeriodicUpdate, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_burn_brutallus_AuraScript(); } @@ -277,7 +277,7 @@ class spell_gen_cannibalize : public SpellScriptLoader { PrepareSpellScript(spell_gen_cannibalize_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_CANNIBALIZE_TRIGGERED)) return false; @@ -304,14 +304,14 @@ class spell_gen_cannibalize : public SpellScriptLoader caster->CastSpell(caster, SPELL_CANNIBALIZE_TRIGGERED, false); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_gen_cannibalize_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); OnCheckCast += SpellCheckCastFn(spell_gen_cannibalize_SpellScript::CheckIfCorpseNear); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_cannibalize_SpellScript(); } @@ -333,7 +333,7 @@ class spell_gen_create_lance : public SpellScriptLoader { PrepareSpellScript(spell_gen_create_lance_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_CREATE_LANCE_ALLIANCE) || !sSpellMgr->GetSpellInfo(SPELL_CREATE_LANCE_HORDE)) return false; @@ -353,13 +353,13 @@ class spell_gen_create_lance : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_create_lance_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_create_lance_SpellScript(); } @@ -380,7 +380,7 @@ class spell_gen_netherbloom : public SpellScriptLoader { PrepareSpellScript(spell_gen_netherbloom_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { for (uint8 i = 0; i < 5; ++i) if (!sSpellMgr->GetSpellInfo(SPELL_NETHERBLOOM_POLLEN_1 + i)) @@ -411,13 +411,13 @@ class spell_gen_netherbloom : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_netherbloom_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_netherbloom_SpellScript(); } @@ -438,7 +438,7 @@ class spell_gen_nightmare_vine : public SpellScriptLoader { PrepareSpellScript(spell_gen_nightmare_vine_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_NIGHTMARE_POLLEN)) return false; @@ -457,13 +457,13 @@ class spell_gen_nightmare_vine : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_nightmare_vine_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_nightmare_vine_SpellScript(); } @@ -489,7 +489,7 @@ class spell_gen_obsidian_armor : public SpellScriptLoader { PrepareAuraScript(spell_gen_obsidian_armor_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_GEN_OBSIDIAN_ARMOR_HOLY) || !sSpellMgr->GetSpellInfo(SPELL_GEN_OBSIDIAN_ARMOR_FIRE) || @@ -543,14 +543,14 @@ class spell_gen_obsidian_armor : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), spellId, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_gen_obsidian_armor_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_gen_obsidian_armor_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_obsidian_armor_AuraScript(); } @@ -572,7 +572,7 @@ class spell_gen_parachute : public SpellScriptLoader { PrepareAuraScript(spell_gen_parachute_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PARACHUTE) || !sSpellMgr->GetSpellInfo(SPELL_PARACHUTE_BUFF)) return false; @@ -589,13 +589,13 @@ class spell_gen_parachute : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_parachute_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_parachute_AuraScript(); } @@ -617,7 +617,7 @@ class spell_gen_pet_summoned : public SpellScriptLoader { PrepareSpellScript(spell_gen_pet_summoned_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -655,13 +655,13 @@ class spell_gen_pet_summoned : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_pet_summoned_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_pet_summoned_SpellScript(); } @@ -685,13 +685,13 @@ class spell_gen_remove_flight_auras : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_remove_flight_auras_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_remove_flight_auras_SpellScript(); } @@ -716,7 +716,7 @@ class spell_gen_elune_candle : public SpellScriptLoader class spell_gen_elune_candle_SpellScript : public SpellScript { PrepareSpellScript(spell_gen_elune_candle_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ELUNE_CANDLE_OMEN_HEAD)) return false; @@ -751,13 +751,13 @@ class spell_gen_elune_candle : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), spellId, true, NULL); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_elune_candle_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_elune_candle_SpellScript(); } @@ -782,13 +782,13 @@ class spell_creature_permanent_feign_death : public SpellScriptLoader target->ToCreature()->SetReactState(REACT_PASSIVE); } - void Register() + void Register() OVERRIDE { OnEffectApply += AuraEffectApplyFn(spell_creature_permanent_feign_death_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_creature_permanent_feign_death_AuraScript(); } @@ -809,12 +809,12 @@ class spell_pvp_trinket_wotf_shared_cd : public SpellScriptLoader { PrepareSpellScript(spell_pvp_trinket_wotf_shared_cd_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WILL_OF_THE_FORSAKEN_COOLDOWN_TRIGGER) || !sSpellMgr->GetSpellInfo(SPELL_WILL_OF_THE_FORSAKEN_COOLDOWN_TRIGGER_WOTF)) return false; @@ -828,13 +828,13 @@ class spell_pvp_trinket_wotf_shared_cd : public SpellScriptLoader GetCaster()->ToPlayer()->AddSpellAndCategoryCooldowns(GetSpellInfo(), GetCastItem() ? GetCastItem()->GetEntry() : 0, GetSpell()); } - void Register() + void Register() OVERRIDE { AfterCast += SpellCastFn(spell_pvp_trinket_wotf_shared_cd_SpellScript::HandleScript); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pvp_trinket_wotf_shared_cd_SpellScript(); } @@ -855,7 +855,7 @@ class spell_gen_animal_blood : public SpellScriptLoader { PrepareAuraScript(spell_gen_animal_blood_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SPAWN_BLOOD_POOL)) return false; @@ -876,14 +876,14 @@ class spell_gen_animal_blood : public SpellScriptLoader owner->CastSpell(owner, SPELL_SPAWN_BLOOD_POOL, true); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectRemoveFn(spell_gen_animal_blood_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_gen_animal_blood_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_animal_blood_AuraScript(); } @@ -904,12 +904,12 @@ class spell_gen_divine_storm_cd_reset : public SpellScriptLoader { PrepareSpellScript(spell_gen_divine_storm_cd_reset_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DIVINE_STORM)) return false; @@ -923,13 +923,13 @@ class spell_gen_divine_storm_cd_reset : public SpellScriptLoader caster->RemoveSpellCooldown(SPELL_DIVINE_STORM, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_divine_storm_cd_reset_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_divine_storm_cd_reset_SpellScript(); } @@ -944,7 +944,7 @@ class spell_gen_gunship_portal : public SpellScriptLoader { PrepareSpellScript(spell_gen_gunship_portal_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -957,13 +957,13 @@ class spell_gen_gunship_portal : public SpellScriptLoader bg->DoAction(1, caster->GetGUID()); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_gunship_portal_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_gunship_portal_SpellScript(); } @@ -990,13 +990,13 @@ class spell_gen_parachute_ic : public SpellScriptLoader target->CastSpell(target, SPELL_PARACHUTE_IC, true); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_parachute_ic_AuraScript::HandleTriggerSpell, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_parachute_ic_AuraScript(); } @@ -1011,7 +1011,7 @@ class spell_gen_dungeon_credit : public SpellScriptLoader { PrepareSpellScript(spell_gen_dungeon_credit_SpellScript); - bool Load() + bool Load() OVERRIDE { _handled = false; return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1029,7 +1029,7 @@ class spell_gen_dungeon_credit : public SpellScriptLoader instance->UpdateEncounterState(ENCOUNTER_CREDIT_CAST_SPELL, GetSpellInfo()->Id, caster); } - void Register() + void Register() OVERRIDE { AfterHit += SpellHitFn(spell_gen_dungeon_credit_SpellScript::CreditEncounter); } @@ -1037,7 +1037,7 @@ class spell_gen_dungeon_credit : public SpellScriptLoader bool _handled; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_dungeon_credit_SpellScript(); } @@ -1052,7 +1052,7 @@ class spell_gen_profession_research : public SpellScriptLoader { PrepareSpellScript(spell_gen_profession_research_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -1080,14 +1080,14 @@ class spell_gen_profession_research : public SpellScriptLoader caster->UpdateCraftSkill(spellId); } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_gen_profession_research_SpellScript::CheckRequirement); OnEffectHitTarget += SpellEffectFn(spell_gen_profession_research_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_profession_research_SpellScript(); } @@ -1109,14 +1109,14 @@ class spell_generic_clone : public SpellScriptLoader GetHitUnit()->CastSpell(GetCaster(), spellId, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_generic_clone_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); OnEffectHitTarget += SpellEffectFn(spell_generic_clone_SpellScript::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_generic_clone_SpellScript(); } @@ -1156,13 +1156,13 @@ class spell_generic_clone_weapon : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_generic_clone_weapon_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_generic_clone_weapon_SpellScript(); } @@ -1179,7 +1179,7 @@ class spell_gen_clone_weapon_aura : public SpellScriptLoader uint32 prevItem; - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_COPY_WEAPON_AURA) || !sSpellMgr->GetSpellInfo(SPELL_COPY_WEAPON_2_AURA) || !sSpellMgr->GetSpellInfo(SPELL_COPY_WEAPON_3_AURA) || !sSpellMgr->GetSpellInfo(SPELL_COPY_OFFHAND_AURA) || !sSpellMgr->GetSpellInfo(SPELL_COPY_OFFHAND_2_AURA) || !sSpellMgr->GetSpellInfo(SPELL_COPY_RANGED_AURA)) @@ -1273,7 +1273,7 @@ class spell_gen_clone_weapon_aura : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectApply += AuraEffectApplyFn(spell_gen_clone_weapon_auraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); OnEffectRemove += AuraEffectRemoveFn(spell_gen_clone_weapon_auraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); @@ -1281,7 +1281,7 @@ class spell_gen_clone_weapon_aura : public SpellScriptLoader }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_clone_weapon_auraScript(); } @@ -1301,14 +1301,14 @@ class spell_gen_seaforium_blast : public SpellScriptLoader { PrepareSpellScript(spell_gen_seaforium_blast_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PLANT_CHARGES_CREDIT_ACHIEVEMENT)) return false; return true; } - bool Load() + bool Load() OVERRIDE { // OriginalCaster is always available in Spell::prepare return GetOriginalCaster()->GetTypeId() == TYPEID_PLAYER; @@ -1323,13 +1323,13 @@ class spell_gen_seaforium_blast : public SpellScriptLoader originalCaster->CastSpell(originalCaster, SPELL_PLANT_CHARGES_CREDIT_ACHIEVEMENT, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_seaforium_blast_SpellScript::AchievementCredit, EFFECT_1, SPELL_EFFECT_GAMEOBJECT_DAMAGE); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_seaforium_blast_SpellScript(); } @@ -1370,7 +1370,7 @@ class spell_gen_turkey_marker : public SpellScriptLoader ModStackAmount(-1, AURA_REMOVE_BY_EXPIRE); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_gen_turkey_marker_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_turkey_marker_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); @@ -1379,7 +1379,7 @@ class spell_gen_turkey_marker : public SpellScriptLoader std::list<uint32> _applyTimes; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_turkey_marker_AuraScript(); } @@ -1400,13 +1400,13 @@ class spell_gen_lifeblood : public SpellScriptLoader amount += int32(CalculatePct(owner->GetMaxHealth(), 1.5f / aurEff->GetTotalTicks())); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_lifeblood_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_lifeblood_AuraScript(); } @@ -1455,13 +1455,13 @@ class spell_gen_magic_rooster : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_magic_rooster_SpellScript::HandleScript, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_magic_rooster_SpellScript(); } @@ -1483,13 +1483,13 @@ class spell_gen_allow_cast_from_item_only : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_gen_allow_cast_from_item_only_SpellScript::CheckRequirement); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_allow_cast_from_item_only_SpellScript(); } @@ -1534,14 +1534,14 @@ class spell_gen_launch : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_launch_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_FORCE_CAST); AfterHit += SpellHitFn(spell_gen_launch_SpellScript::Launch); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_launch_SpellScript(); } @@ -1561,7 +1561,7 @@ class spell_gen_vehicle_scaling : public SpellScriptLoader { PrepareAuraScript(spell_gen_vehicle_scaling_AuraScript); - bool Load() + bool Load() OVERRIDE { return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -1592,7 +1592,7 @@ class spell_gen_vehicle_scaling : public SpellScriptLoader amount = uint16((avgILvl - baseItemLevel) * factor); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_vehicle_scaling_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_HEALING_PCT); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_vehicle_scaling_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); @@ -1600,7 +1600,7 @@ class spell_gen_vehicle_scaling : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_vehicle_scaling_AuraScript(); } @@ -1616,7 +1616,7 @@ class spell_gen_oracle_wolvar_reputation : public SpellScriptLoader { PrepareSpellScript(spell_gen_oracle_wolvar_reputation_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -1640,13 +1640,13 @@ class spell_gen_oracle_wolvar_reputation : public SpellScriptLoader // EFFECT_INDEX_2 most likely update at war state, we already handle this in SetReputation } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_gen_oracle_wolvar_reputation_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_oracle_wolvar_reputation_SpellScript(); } @@ -1670,7 +1670,7 @@ class spell_gen_damage_reduction_aura : public SpellScriptLoader { PrepareAuraScript(spell_gen_damage_reduction_AuraScript); - bool Validate(SpellInfo const* /*SpellEntry*/) + bool Validate(SpellInfo const* /*SpellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DAMAGE_REDUCTION_AURA)) return false; @@ -1693,7 +1693,7 @@ class spell_gen_damage_reduction_aura : public SpellScriptLoader target->RemoveAurasDueToSpell(SPELL_DAMAGE_REDUCTION_AURA); } - void Register() + void Register() OVERRIDE { OnEffectApply += AuraEffectApplyFn(spell_gen_damage_reduction_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); OnEffectRemove += AuraEffectRemoveFn(spell_gen_damage_reduction_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); @@ -1701,7 +1701,7 @@ class spell_gen_damage_reduction_aura : public SpellScriptLoader }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_damage_reduction_AuraScript(); } @@ -1722,7 +1722,7 @@ class spell_gen_dummy_trigger : public SpellScriptLoader { PrepareSpellScript(spell_gen_dummy_trigger_SpellScript); - bool Validate(SpellInfo const* /*SpellEntry*/) + bool Validate(SpellInfo const* /*SpellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PERSISTANT_SHIELD_TRIGGERED) || !sSpellMgr->GetSpellInfo(SPELL_PERSISTANT_SHIELD)) return false; @@ -1739,13 +1739,13 @@ class spell_gen_dummy_trigger : public SpellScriptLoader caster->CastCustomSpell(target, SPELL_PERSISTANT_SHIELD_TRIGGERED, &damage, NULL, NULL, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_dummy_trigger_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_dummy_trigger_SpellScript(); } @@ -1761,7 +1761,7 @@ class spell_gen_spirit_healer_res : public SpellScriptLoader { PrepareSpellScript(spell_gen_spirit_healer_res_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetOriginalCaster() && GetOriginalCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -1777,13 +1777,13 @@ class spell_gen_spirit_healer_res : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_spirit_healer_res_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_spirit_healer_res_SpellScript(); } @@ -1805,7 +1805,7 @@ class spell_gen_gadgetzan_transporter_backfire : public SpellScriptLoader { PrepareSpellScript(spell_gen_gadgetzan_transporter_backfire_SpellScript) - bool Validate(SpellInfo const* /*SpellEntry*/) + bool Validate(SpellInfo const* /*SpellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_TRANSPORTER_MALFUNCTION_POLYMORPH) || !sSpellMgr->GetSpellInfo(SPELL_TRANSPORTER_EVIL_TWIN) || !sSpellMgr->GetSpellInfo(SPELL_TRANSPORTER_MALFUNCTION_MISS)) @@ -1825,13 +1825,13 @@ class spell_gen_gadgetzan_transporter_backfire : public SpellScriptLoader caster->CastSpell(caster, SPELL_TRANSPORTER_MALFUNCTION_MISS, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_gadgetzan_transporter_backfire_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_gadgetzan_transporter_backfire_SpellScript(); } @@ -1852,7 +1852,7 @@ class spell_gen_gnomish_transporter : public SpellScriptLoader { PrepareSpellScript(spell_gen_gnomish_transporter_SpellScript) - bool Validate(SpellInfo const* /*SpellEntry*/) + bool Validate(SpellInfo const* /*SpellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_TRANSPORTER_SUCCESS) || !sSpellMgr->GetSpellInfo(SPELL_TRANSPORTER_FAILURE)) return false; @@ -1865,13 +1865,13 @@ class spell_gen_gnomish_transporter : public SpellScriptLoader caster->CastSpell(caster, roll_chance_i(50) ? SPELL_TRANSPORTER_SUCCESS : SPELL_TRANSPORTER_FAILURE, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_gnomish_transporter_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_gnomish_transporter_SpellScript(); } @@ -1896,7 +1896,7 @@ class spell_gen_dalaran_disguise : public SpellScriptLoader class spell_gen_dalaran_disguise_SpellScript : public SpellScript { PrepareSpellScript(spell_gen_dalaran_disguise_SpellScript); - bool Validate(SpellInfo const* spellEntry) + bool Validate(SpellInfo const* spellEntry) OVERRIDE { switch (spellEntry->Id) { @@ -1935,13 +1935,13 @@ class spell_gen_dalaran_disguise : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_dalaran_disguise_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_dalaran_disguise_SpellScript(); } @@ -2044,13 +2044,13 @@ class spell_gen_break_shield: public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_break_shield_SpellScript::HandleScriptEffect, EFFECT_FIRST_FOUND, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_break_shield_SpellScript(); } @@ -2199,7 +2199,7 @@ class spell_gen_mounted_charge: public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), spellId, false); } - void Register() + void Register() OVERRIDE { SpellInfo const* spell = sSpellMgr->GetSpellInfo(m_scriptSpellId); @@ -2211,7 +2211,7 @@ class spell_gen_mounted_charge: public SpellScriptLoader } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_mounted_charge_SpellScript(); } @@ -2233,7 +2233,7 @@ class spell_gen_defend : public SpellScriptLoader { PrepareAuraScript(spell_gen_defend_AuraScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_VISUAL_SHIELD_1)) return false; @@ -2273,7 +2273,7 @@ class spell_gen_defend : public SpellScriptLoader rider->RemoveAurasDueToSpell(GetId()); } - void Register() + void Register() OVERRIDE { SpellInfo const* spell = sSpellMgr->GetSpellInfo(m_scriptSpellId); @@ -2297,7 +2297,7 @@ class spell_gen_defend : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_defend_AuraScript(); } @@ -2318,7 +2318,7 @@ class spell_gen_tournament_duel : public SpellScriptLoader { PrepareSpellScript(spell_gen_tournament_duel_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ON_TOURNAMENT_MOUNT)) return false; @@ -2344,13 +2344,13 @@ class spell_gen_tournament_duel : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_tournament_duel_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_tournament_duel_SpellScript(); } @@ -2370,7 +2370,7 @@ class spell_gen_summon_tournament_mount : public SpellScriptLoader { PrepareSpellScript(spell_gen_summon_tournament_mount_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_LANCE_EQUIPPED)) return false; @@ -2391,13 +2391,13 @@ class spell_gen_summon_tournament_mount : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_gen_summon_tournament_mount_SpellScript::CheckIfLanceEquiped); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_summon_tournament_mount_SpellScript(); } @@ -2509,7 +2509,7 @@ class spell_gen_on_tournament_mount : public SpellScriptLoader uint32 _pennantSpellId; - bool Load() + bool Load() OVERRIDE { _pennantSpellId = 0; return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -2643,14 +2643,14 @@ class spell_gen_on_tournament_mount : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_gen_on_tournament_mount_AuraScript::HandleApplyEffect, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); OnEffectRemove += AuraEffectRemoveFn(spell_gen_on_tournament_mount_AuraScript::HandleRemoveEffect, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_on_tournament_mount_AuraScript(); } @@ -2665,7 +2665,7 @@ class spell_gen_tournament_pennant : public SpellScriptLoader { PrepareAuraScript(spell_gen_tournament_pennant_AuraScript); - bool Load() + bool Load() OVERRIDE { return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -2677,13 +2677,13 @@ class spell_gen_tournament_pennant : public SpellScriptLoader caster->RemoveAurasDueToSpell(GetId()); } - void Register() + void Register() OVERRIDE { OnEffectApply += AuraEffectApplyFn(spell_gen_tournament_pennant_AuraScript::HandleApplyEffect, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_tournament_pennant_AuraScript(); } @@ -2703,7 +2703,7 @@ class spell_gen_chaos_blast : public SpellScriptLoader { PrepareSpellScript(spell_gen_chaos_blast_SpellScript) - bool Validate(SpellInfo const* /*SpellEntry*/) + bool Validate(SpellInfo const* /*SpellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_CHAOS_BLAST)) return false; @@ -2717,13 +2717,13 @@ class spell_gen_chaos_blast : public SpellScriptLoader caster->CastCustomSpell(target, SPELL_CHAOS_BLAST, &basepoints0, NULL, NULL, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_chaos_blast_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_chaos_blast_SpellScript(); } @@ -2755,13 +2755,13 @@ class spell_gen_ds_flush_knockback : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_ds_flush_knockback_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_ds_flush_knockback_SpellScript(); } @@ -2783,13 +2783,13 @@ class spell_gen_wg_water : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_gen_wg_water_SpellScript::CheckCast); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_wg_water_SpellScript(); } @@ -2815,7 +2815,7 @@ class spell_gen_count_pct_from_max_hp : public SpellScriptLoader SetHitDamage(GetHitUnit()->CountPctFromMaxHealth(_damagePct)); } - void Register() + void Register() OVERRIDE { OnHit += SpellHitFn(spell_gen_count_pct_from_max_hp_SpellScript::RecalculateDamage); } @@ -2824,7 +2824,7 @@ class spell_gen_count_pct_from_max_hp : public SpellScriptLoader int32 _damagePct; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_count_pct_from_max_hp_SpellScript(_damagePct); } @@ -2842,7 +2842,7 @@ public: { PrepareSpellScript(spell_gen_despawn_self_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_UNIT; } @@ -2853,13 +2853,13 @@ public: GetCaster()->ToCreature()->DespawnOrUnsummon(); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_despawn_self_SpellScript::HandleDummy, EFFECT_ALL, SPELL_EFFECT_ANY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_despawn_self_SpellScript(); } @@ -2880,13 +2880,13 @@ public: SetHitDamage(bp); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_touch_the_nightmare_SpellScript::HandleDamageCalc, EFFECT_2, SPELL_EFFECT_SCHOOL_DAMAGE); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_touch_the_nightmare_SpellScript(); } @@ -2909,14 +2909,14 @@ public: canBeRecalculated = false; } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_dream_funnel_AuraScript::HandleEffectCalcAmount, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_dream_funnel_AuraScript::HandleEffectCalcAmount, EFFECT_2, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_dream_funnel_AuraScript(); } @@ -2936,7 +2936,7 @@ class spell_gen_bandage : public SpellScriptLoader { PrepareSpellScript(spell_gen_bandage_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_RECENTLY_BANDAGED)) return false; @@ -2959,14 +2959,14 @@ class spell_gen_bandage : public SpellScriptLoader GetCaster()->CastSpell(target, SPELL_RECENTLY_BANDAGED, true); } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_gen_bandage_SpellScript::CheckCast); AfterHit += SpellHitFn(spell_gen_bandage_SpellScript::HandleScript); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_bandage_SpellScript(); } @@ -2993,7 +2993,7 @@ class spell_gen_lifebloom : public SpellScriptLoader public: spell_gen_lifebloom_AuraScript(uint32 spellId) : AuraScript(), _spellId(spellId) { } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(_spellId)) return false; @@ -3010,7 +3010,7 @@ class spell_gen_lifebloom : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), _spellId, true, NULL, aurEff, GetCasterGUID()); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_gen_lifebloom_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL); } @@ -3019,7 +3019,7 @@ class spell_gen_lifebloom : public SpellScriptLoader uint32 _spellId; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_lifebloom_AuraScript(_spellId); } @@ -3046,7 +3046,7 @@ class spell_gen_summon_elemental : public SpellScriptLoader public: spell_gen_summon_elemental_AuraScript(uint32 spellId) : AuraScript(), _spellId(spellId) { } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(_spellId)) return false; @@ -3068,7 +3068,7 @@ class spell_gen_summon_elemental : public SpellScriptLoader owner->ToPlayer()->RemovePet(NULL, PET_SAVE_NOT_IN_SLOT, true); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_gen_summon_elemental_AuraScript::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_gen_summon_elemental_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); @@ -3078,7 +3078,7 @@ class spell_gen_summon_elemental : public SpellScriptLoader uint32 _spellId; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_summon_elemental_AuraScript(_spellId); } @@ -3151,7 +3151,7 @@ class spell_gen_mount : public SpellScriptLoader spell_gen_mount_SpellScript(uint32 mount0, uint32 mount60, uint32 mount100, uint32 mount150, uint32 mount280, uint32 mount310) : SpellScript(), _mount0(mount0), _mount60(mount60), _mount100(mount100), _mount150(mount150), _mount280(mount280), _mount310(mount310) { } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (_mount0 && !sSpellMgr->GetSpellInfo(_mount0)) return false; @@ -3231,7 +3231,7 @@ class spell_gen_mount : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_mount_SpellScript::HandleMount, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); } @@ -3245,7 +3245,7 @@ class spell_gen_mount : public SpellScriptLoader uint32 _mount310; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_mount_SpellScript(_mount0, _mount60, _mount100, _mount150, _mount280, _mount310); } @@ -3297,13 +3297,13 @@ class spell_gen_upper_deck_create_foam_sword : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_upper_deck_create_foam_sword_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_upper_deck_create_foam_sword_SpellScript(); } @@ -3337,13 +3337,13 @@ class spell_gen_bonked : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_bonked_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_bonked_SpellScript(); } @@ -3389,13 +3389,13 @@ class spell_gen_gift_of_naaru : public SpellScriptLoader amount += int32(std::max(healTick, 0)); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_gift_of_naaru_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_gift_of_naaru_AuraScript(); } @@ -3416,7 +3416,7 @@ class spell_gen_replenishment : public SpellScriptLoader { PrepareAuraScript(spell_gen_replenishment_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_REPLENISHMENT) || !sSpellMgr->GetSpellInfo(SPELL_INFINITE_REPLENISHMENT)) @@ -3424,7 +3424,7 @@ class spell_gen_replenishment : public SpellScriptLoader return true; } - bool Load() + bool Load() OVERRIDE { return GetUnitOwner()->GetPower(POWER_MANA); } @@ -3444,13 +3444,13 @@ class spell_gen_replenishment : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_replenishment_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_ENERGIZE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_replenishment_AuraScript(); } @@ -3473,7 +3473,7 @@ class spell_gen_aura_service_uniform : public SpellScriptLoader { PrepareAuraScript(spell_gen_aura_service_uniform_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SERVICE_UNIFORM)) return false; @@ -3500,14 +3500,14 @@ class spell_gen_aura_service_uniform : public SpellScriptLoader target->RestoreDisplayId(); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectRemoveFn(spell_gen_aura_service_uniform_AuraScript::OnApply, EFFECT_0, SPELL_AURA_TRANSFORM, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_gen_aura_service_uniform_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_TRANSFORM, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_aura_service_uniform_AuraScript(); } @@ -3529,7 +3529,7 @@ class spell_gen_orc_disguise : public SpellScriptLoader { PrepareSpellScript(spell_gen_orc_disguise_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ORC_DISGUISE_TRIGGER) || !sSpellMgr->GetSpellInfo(SPELL_ORC_DISGUISE_MALE) || !sSpellMgr->GetSpellInfo(SPELL_ORC_DISGUISE_FEMALE)) @@ -3550,13 +3550,13 @@ class spell_gen_orc_disguise : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_orc_disguise_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_orc_disguise_SpellScript(); } @@ -3576,7 +3576,7 @@ class spell_gen_whisper_gulch_yogg_saron_whisper : public SpellScriptLoader { PrepareAuraScript(spell_gen_whisper_gulch_yogg_saron_whisper_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_YOGG_SARON_WHISPER_DUMMY)) return false; @@ -3589,13 +3589,13 @@ class spell_gen_whisper_gulch_yogg_saron_whisper : public SpellScriptLoader GetTarget()->CastSpell((Unit*)NULL, SPELL_YOGG_SARON_WHISPER_DUMMY, true); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_whisper_gulch_yogg_saron_whisper_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_whisper_gulch_yogg_saron_whisper_AuraScript(); } @@ -3624,13 +3624,13 @@ class spell_gen_spectator_cheer_trigger : public SpellScriptLoader GetCaster()->HandleEmoteCommand(EmoteArray[urand(0, 2)]); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_spectator_cheer_trigger_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_spectator_cheer_trigger_SpellScript(); } @@ -3660,13 +3660,13 @@ class spell_gen_vendor_bark_trigger : public SpellScriptLoader vendor->AI()->Talk(SAY_AMPHITHEATER_VENDOR); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_vendor_bark_trigger_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_vendor_bark_trigger_SpellScript(); } diff --git a/src/server/scripts/Spells/spell_holiday.cpp b/src/server/scripts/Spells/spell_holiday.cpp index 37b6a202ed4..f61da1f7179 100644 --- a/src/server/scripts/Spells/spell_holiday.cpp +++ b/src/server/scripts/Spells/spell_holiday.cpp @@ -99,14 +99,14 @@ class spell_love_is_in_the_air_romantic_picnic : public SpellScriptLoader target->RemoveAura(SPELL_ROMANTIC_PICNIC_ACHIEV); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_love_is_in_the_air_romantic_picnic_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectPeriodic += AuraEffectPeriodicFn(spell_love_is_in_the_air_romantic_picnic_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_love_is_in_the_air_romantic_picnic_AuraScript(); } @@ -136,7 +136,7 @@ class spell_hallow_end_trick : public SpellScriptLoader { PrepareSpellScript(spell_hallow_end_trick_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PIRATE_COSTUME_MALE) || !sSpellMgr->GetSpellInfo(SPELL_PIRATE_COSTUME_FEMALE) || !sSpellMgr->GetSpellInfo(SPELL_NINJA_COSTUME_MALE) || !sSpellMgr->GetSpellInfo(SPELL_NINJA_COSTUME_FEMALE) || !sSpellMgr->GetSpellInfo(SPELL_LEPER_GNOME_COSTUME_MALE) || !sSpellMgr->GetSpellInfo(SPELL_LEPER_GNOME_COSTUME_FEMALE) @@ -177,13 +177,13 @@ class spell_hallow_end_trick : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_hallow_end_trick_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_hallow_end_trick_SpellScript(); } @@ -209,7 +209,7 @@ class spell_hallow_end_trick_or_treat : public SpellScriptLoader { PrepareSpellScript(spell_hallow_end_trick_or_treat_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_TRICK) || !sSpellMgr->GetSpellInfo(SPELL_TREAT) || !sSpellMgr->GetSpellInfo(SPELL_TRICKED_OR_TREATED)) return false; @@ -226,13 +226,13 @@ class spell_hallow_end_trick_or_treat : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_hallow_end_trick_or_treat_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_hallow_end_trick_or_treat_SpellScript(); } @@ -247,7 +247,7 @@ class spell_hallow_end_tricky_treat : public SpellScriptLoader { PrepareSpellScript(spell_hallow_end_tricky_treat_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_TRICKY_TREAT_SPEED)) return false; @@ -265,13 +265,13 @@ class spell_hallow_end_tricky_treat : public SpellScriptLoader caster->CastSpell(caster, SPELL_UPSET_TUMMY, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_hallow_end_tricky_treat_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_hallow_end_tricky_treat_SpellScript(); } @@ -293,7 +293,7 @@ class spell_winter_veil_mistletoe : public SpellScriptLoader { PrepareSpellScript(spell_winter_veil_mistletoe_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_CREATE_MISTLETOE) || !sSpellMgr->GetSpellInfo(SPELL_CREATE_HOLLY) || @@ -311,13 +311,13 @@ class spell_winter_veil_mistletoe : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_winter_veil_mistletoe_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_winter_veil_mistletoe_SpellScript(); } @@ -341,7 +341,7 @@ class spell_winter_veil_px_238_winter_wondervolt : public SpellScriptLoader { PrepareSpellScript(spell_winter_veil_px_238_winter_wondervolt_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PX_238_WINTER_WONDERVOLT_TRANSFORM_1) || !sSpellMgr->GetSpellInfo(SPELL_PX_238_WINTER_WONDERVOLT_TRANSFORM_2) || @@ -373,7 +373,7 @@ class spell_winter_veil_px_238_winter_wondervolt : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_winter_veil_px_238_winter_wondervolt_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } @@ -382,7 +382,7 @@ class spell_winter_veil_px_238_winter_wondervolt : public SpellScriptLoader }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_winter_veil_px_238_winter_wondervolt_SpellScript(); } diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 2965d6a7a5f..98ba9babb63 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -63,12 +63,12 @@ class spell_hun_aspect_of_the_beast : public SpellScriptLoader { PrepareAuraScript(spell_hun_aspect_of_the_beast_AuraScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_ASPECT_OF_THE_BEAST_PET)) return false; @@ -89,14 +89,14 @@ class spell_hun_aspect_of_the_beast : public SpellScriptLoader caster->CastSpell(caster, SPELL_HUNTER_ASPECT_OF_THE_BEAST_PET, true); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_hun_aspect_of_the_beast_AuraScript::OnApply, EFFECT_0, SPELL_AURA_UNTRACKABLE, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_hun_aspect_of_the_beast_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_UNTRACKABLE, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_hun_aspect_of_the_beast_AuraScript(); } @@ -112,7 +112,7 @@ class spell_hun_ascpect_of_the_viper : public SpellScriptLoader { PrepareAuraScript(spell_hun_ascpect_of_the_viper_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_ASPECT_OF_THE_VIPER_ENERGIZE)) return false; @@ -134,13 +134,13 @@ class spell_hun_ascpect_of_the_viper : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_HUNTER_ASPECT_OF_THE_VIPER_ENERGIZE, SPELLVALUE_BASE_POINT0, mana, GetTarget(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { OnEffectProc += AuraEffectProcFn(spell_hun_ascpect_of_the_viper_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_OBS_MOD_POWER); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_hun_ascpect_of_the_viper_AuraScript(); } @@ -156,7 +156,7 @@ class spell_hun_chimera_shot : public SpellScriptLoader { PrepareSpellScript(spell_hun_chimera_shot_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_CHIMERA_SHOT_SERPENT) || !sSpellMgr->GetSpellInfo(SPELL_HUNTER_CHIMERA_SHOT_VIPER) || !sSpellMgr->GetSpellInfo(SPELL_HUNTER_CHIMERA_SHOT_SCORPID)) return false; @@ -227,13 +227,13 @@ class spell_hun_chimera_shot : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_hun_chimera_shot_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_hun_chimera_shot_SpellScript(); } @@ -258,13 +258,13 @@ class spell_hun_disengage : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_hun_disengage_SpellScript::CheckCast); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_hun_disengage_SpellScript(); } @@ -280,7 +280,7 @@ class spell_hun_invigoration : public SpellScriptLoader { PrepareSpellScript(spell_hun_invigoration_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_INVIGORATION_TRIGGERED)) return false; @@ -295,13 +295,13 @@ class spell_hun_invigoration : public SpellScriptLoader unitTarget->CastSpell(unitTarget, SPELL_HUNTER_INVIGORATION_TRIGGERED, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_hun_invigoration_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_hun_invigoration_SpellScript(); } @@ -317,7 +317,7 @@ class spell_hun_last_stand_pet : public SpellScriptLoader { PrepareSpellScript(spell_hun_last_stand_pet_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_PET_LAST_STAND_TRIGGERED)) return false; @@ -331,13 +331,13 @@ class spell_hun_last_stand_pet : public SpellScriptLoader caster->CastCustomSpell(caster, SPELL_HUNTER_PET_LAST_STAND_TRIGGERED, &healthModSpellBasePoints0, NULL, NULL, true, NULL); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_hun_last_stand_pet_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_hun_last_stand_pet_SpellScript(); } @@ -353,7 +353,7 @@ class spell_hun_masters_call : public SpellScriptLoader { PrepareSpellScript(spell_hun_masters_call_SpellScript); - bool Validate(SpellInfo const* spellInfo) + bool Validate(SpellInfo const* spellInfo) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_MASTERS_CALL_TRIGGERED) || !sSpellMgr->GetSpellInfo(spellInfo->Effects[EFFECT_0].CalcValue()) || !sSpellMgr->GetSpellInfo(spellInfo->Effects[EFFECT_1].CalcValue())) return false; @@ -382,14 +382,14 @@ class spell_hun_masters_call : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_hun_masters_call_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); OnEffectHitTarget += SpellEffectFn(spell_hun_masters_call_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_hun_masters_call_SpellScript(); } @@ -405,7 +405,7 @@ class spell_hun_misdirection : public SpellScriptLoader { PrepareAuraScript(spell_hun_misdirection_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_MISDIRECTION_PROC)) return false; @@ -429,7 +429,7 @@ class spell_hun_misdirection : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_HUNTER_MISDIRECTION_PROC, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_hun_misdirection_AuraScript::OnRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); DoCheckProc += AuraCheckProcFn(spell_hun_misdirection_AuraScript::CheckProc); @@ -437,7 +437,7 @@ class spell_hun_misdirection : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_hun_misdirection_AuraScript(); } @@ -458,13 +458,13 @@ class spell_hun_misdirection_proc : public SpellScriptLoader GetTarget()->ResetRedirectThreat(); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_hun_misdirection_proc_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_hun_misdirection_proc_AuraScript(); } @@ -480,14 +480,14 @@ class spell_hun_pet_carrion_feeder : public SpellScriptLoader { PrepareSpellScript(spell_hun_pet_carrion_feeder_SpellScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster()->IsPet()) return false; return true; } - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_PET_CARRION_FEEDER_TRIGGERED)) return false; @@ -514,14 +514,14 @@ class spell_hun_pet_carrion_feeder : public SpellScriptLoader caster->CastSpell(caster, SPELL_HUNTER_PET_CARRION_FEEDER_TRIGGERED, false); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_hun_pet_carrion_feeder_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); OnCheckCast += SpellCheckCastFn(spell_hun_pet_carrion_feeder_SpellScript::CheckIfCorpseNear); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_hun_pet_carrion_feeder_SpellScript(); } @@ -537,14 +537,14 @@ class spell_hun_pet_heart_of_the_phoenix : public SpellScriptLoader { PrepareSpellScript(spell_hun_pet_heart_of_the_phoenix_SpellScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster()->IsPet()) return false; return true; } - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_PET_HEART_OF_THE_PHOENIX_TRIGGERED) || !sSpellMgr->GetSpellInfo(SPELL_HUNTER_PET_HEART_OF_THE_PHOENIX_DEBUFF)) return false; @@ -562,13 +562,13 @@ class spell_hun_pet_heart_of_the_phoenix : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_hun_pet_heart_of_the_phoenix_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_hun_pet_heart_of_the_phoenix_SpellScript(); } @@ -584,7 +584,7 @@ class spell_hun_readiness : public SpellScriptLoader { PrepareSpellScript(spell_hun_readiness_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -611,13 +611,13 @@ class spell_hun_readiness : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_hun_readiness_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_hun_readiness_SpellScript(); } @@ -633,7 +633,7 @@ class spell_hun_scatter_shot : public SpellScriptLoader { PrepareSpellScript(spell_hun_scatter_shot_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -647,13 +647,13 @@ class spell_hun_scatter_shot : public SpellScriptLoader caster->SendAttackSwingCancelAttack(); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_hun_scatter_shot_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_hun_scatter_shot_SpellScript(); } @@ -669,7 +669,7 @@ class spell_hun_sniper_training : public SpellScriptLoader { PrepareAuraScript(spell_hun_sniper_training_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_SNIPER_TRAINING_R1) || !sSpellMgr->GetSpellInfo(SPELL_HUNTER_SNIPER_TRAINING_BUFF_R1)) return false; @@ -705,14 +705,14 @@ class spell_hun_sniper_training : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_hun_sniper_training_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_hun_sniper_training_AuraScript::HandleUpdatePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_hun_sniper_training_AuraScript(); } @@ -758,13 +758,13 @@ class spell_hun_tame_beast : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_hun_tame_beast_SpellScript::CheckCast); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_hun_tame_beast_SpellScript(); } @@ -789,14 +789,14 @@ class spell_hun_target_only_pet_and_owner : public SpellScriptLoader targets.push_back(owner); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_hun_target_only_pet_and_owner_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_PARTY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_hun_target_only_pet_and_owner_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_CASTER_AREA_PARTY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_hun_target_only_pet_and_owner_SpellScript(); } diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index c61a547d2c3..9b8e7d489ce 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -47,7 +47,7 @@ class spell_item_trigger_spell : public SpellScriptLoader public: spell_item_trigger_spell_SpellScript(uint32 triggeredSpellId) : SpellScript(), _triggeredSpellId(triggeredSpellId) { } - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(_triggeredSpellId)) return false; @@ -61,13 +61,13 @@ class spell_item_trigger_spell : public SpellScriptLoader caster->CastSpell(caster, _triggeredSpellId, true, item); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_item_trigger_spell_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_trigger_spell_SpellScript(_triggeredSpellId); } @@ -90,13 +90,13 @@ class spell_item_arcane_shroud : public SpellScriptLoader amount += 2 * diff; } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_item_arcane_shroud_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_THREAT); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_item_arcane_shroud_AuraScript(); } @@ -117,7 +117,7 @@ class spell_item_blessing_of_ancient_kings : public SpellScriptLoader { PrepareAuraScript(spell_item_blessing_of_ancient_kings_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PROTECTION_OF_ANCIENT_KINGS)) return false; @@ -146,14 +146,14 @@ class spell_item_blessing_of_ancient_kings : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_PROTECTION_OF_ANCIENT_KINGS, SPELLVALUE_BASE_POINT0, absorb, eventInfo.GetProcTarget(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_item_blessing_of_ancient_kings_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_item_blessing_of_ancient_kings_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_item_blessing_of_ancient_kings_AuraScript(); } @@ -180,7 +180,7 @@ class spell_item_defibrillate : public SpellScriptLoader public: spell_item_defibrillate_SpellScript(uint8 chance, uint32 failSpell) : SpellScript(), _chance(chance), _failSpell(failSpell) { } - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (_failSpell && !sSpellMgr->GetSpellInfo(_failSpell)) return false; @@ -197,7 +197,7 @@ class spell_item_defibrillate : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_defibrillate_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_RESURRECT); } @@ -207,7 +207,7 @@ class spell_item_defibrillate : public SpellScriptLoader uint32 _failSpell; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_defibrillate_SpellScript(_chance, _failSpell); } @@ -237,12 +237,12 @@ class spell_item_deviate_fish : public SpellScriptLoader { PrepareSpellScript(spell_item_deviate_fish_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { for (uint32 spellId = SPELL_SLEEPY; spellId <= SPELL_HEALTHY_SPIRIT; ++spellId) if (!sSpellMgr->GetSpellInfo(spellId)) @@ -257,13 +257,13 @@ class spell_item_deviate_fish : public SpellScriptLoader caster->CastSpell(caster, spellId, true, NULL); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_item_deviate_fish_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_deviate_fish_SpellScript(); } @@ -287,7 +287,7 @@ class spell_item_flask_of_the_north : public SpellScriptLoader { PrepareSpellScript(spell_item_flask_of_the_north_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_FLASK_OF_THE_NORTH_SP) || !sSpellMgr->GetSpellInfo(SPELL_FLASK_OF_THE_NORTH_AP) || !sSpellMgr->GetSpellInfo(SPELL_FLASK_OF_THE_NORTH_STR)) return false; @@ -327,13 +327,13 @@ class spell_item_flask_of_the_north : public SpellScriptLoader caster->CastSpell(caster, possibleSpells[irand(0, (possibleSpells.size() - 1))], true, NULL); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_item_flask_of_the_north_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_flask_of_the_north_SpellScript(); } @@ -356,7 +356,7 @@ class spell_item_gnomish_death_ray : public SpellScriptLoader { PrepareSpellScript(spell_item_gnomish_death_ray_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_GNOMISH_DEATH_RAY_SELF) || !sSpellMgr->GetSpellInfo(SPELL_GNOMISH_DEATH_RAY_TARGET)) return false; @@ -375,13 +375,13 @@ class spell_item_gnomish_death_ray : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_gnomish_death_ray_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_gnomish_death_ray_SpellScript(); } @@ -407,12 +407,12 @@ class spell_item_make_a_wish : public SpellScriptLoader { PrepareSpellScript(spell_item_make_a_wish_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MR_PINCHYS_BLESSING) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_MIGHTY_MR_PINCHY) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_FURIOUS_MR_PINCHY) || !sSpellMgr->GetSpellInfo(SPELL_TINY_MAGICAL_CRAWDAD) || !sSpellMgr->GetSpellInfo(SPELL_MR_PINCHYS_GIFT)) return false; @@ -433,13 +433,13 @@ class spell_item_make_a_wish : public SpellScriptLoader caster->CastSpell(caster, spellId, true, NULL); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_item_make_a_wish_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_make_a_wish_SpellScript(); } @@ -489,13 +489,13 @@ class spell_item_mingos_fortune_generator : public SpellScriptLoader CreateItem(effIndex, newitemid); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_item_mingos_fortune_generator_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_mingos_fortune_generator_SpellScript(); } @@ -516,7 +516,7 @@ class spell_item_necrotic_touch : public SpellScriptLoader { PrepareAuraScript(spell_item_necrotic_touch_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ITEM_NECROTIC_TOUCH_PROC)) return false; @@ -530,13 +530,13 @@ class spell_item_necrotic_touch : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_ITEM_NECROTIC_TOUCH_PROC, SPELLVALUE_BASE_POINT0, bp, GetTarget(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { OnEffectProc += AuraEffectProcFn(spell_item_necrotic_touch_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_item_necrotic_touch_AuraScript(); } @@ -560,7 +560,7 @@ class spell_item_net_o_matic : public SpellScriptLoader { PrepareSpellScript(spell_item_net_o_matic_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_NET_O_MATIC_TRIGGERED1) || !sSpellMgr->GetSpellInfo(SPELL_NET_O_MATIC_TRIGGERED2) || !sSpellMgr->GetSpellInfo(SPELL_NET_O_MATIC_TRIGGERED3)) return false; @@ -582,13 +582,13 @@ class spell_item_net_o_matic : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_net_o_matic_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_net_o_matic_SpellScript(); } @@ -612,12 +612,12 @@ class spell_item_noggenfogger_elixir : public SpellScriptLoader { PrepareSpellScript(spell_item_noggenfogger_elixir_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_NOGGENFOGGER_ELIXIR_TRIGGERED1) || !sSpellMgr->GetSpellInfo(SPELL_NOGGENFOGGER_ELIXIR_TRIGGERED2) || !sSpellMgr->GetSpellInfo(SPELL_NOGGENFOGGER_ELIXIR_TRIGGERED3)) return false; @@ -637,13 +637,13 @@ class spell_item_noggenfogger_elixir : public SpellScriptLoader caster->CastSpell(caster, spellId, true, NULL); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_item_noggenfogger_elixir_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_noggenfogger_elixir_SpellScript(); } @@ -666,13 +666,13 @@ class spell_item_piccolo_of_the_flaming_fire : public SpellScriptLoader target->HandleEmoteCommand(EMOTE_STATE_DANCE); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_piccolo_of_the_flaming_fire_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_piccolo_of_the_flaming_fire_SpellScript(); } @@ -697,12 +697,12 @@ class spell_item_savory_deviate_delight : public SpellScriptLoader { PrepareSpellScript(spell_item_savory_deviate_delight_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { for (uint32 spellId = SPELL_FLIP_OUT_MALE; spellId <= SPELL_YAAARRRR_FEMALE; ++spellId) if (!sSpellMgr->GetSpellInfo(spellId)) @@ -724,13 +724,13 @@ class spell_item_savory_deviate_delight : public SpellScriptLoader caster->CastSpell(caster, spellId, true, NULL); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_item_savory_deviate_delight_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_savory_deviate_delight_SpellScript(); } @@ -758,7 +758,7 @@ class spell_item_scroll_of_recall : public SpellScriptLoader { PrepareSpellScript(spell_item_scroll_of_recall_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -797,13 +797,13 @@ class spell_item_scroll_of_recall : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_scroll_of_recall_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_TELEPORT_UNITS); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_scroll_of_recall_SpellScript(); } @@ -838,13 +838,13 @@ class spell_item_unsated_craving : public SpellScriptLoader return true; } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_item_unsated_craving_AuraScript::CheckProc); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_item_unsated_craving_AuraScript(); } @@ -869,13 +869,13 @@ class spell_item_shadows_fate : public SpellScriptLoader caster->CastSpell(target, SPELL_SOUL_FEAST, TRIGGERED_FULL_MASK); } - void Register() + void Register() OVERRIDE { OnProc += AuraProcFn(spell_item_shadows_fate_AuraScript::HandleProc); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_item_shadows_fate_AuraScript(); } @@ -900,7 +900,7 @@ class spell_item_shadowmourne : public SpellScriptLoader { PrepareAuraScript(spell_item_shadowmourne_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHADOWMOURNE_CHAOS_BANE_DAMAGE)) return false; @@ -934,14 +934,14 @@ class spell_item_shadowmourne : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_item_shadowmourne_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_item_shadowmourne_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_item_shadowmourne_AuraScript(); } @@ -957,7 +957,7 @@ class spell_item_shadowmourne_soul_fragment : public SpellScriptLoader { PrepareAuraScript(spell_item_shadowmourne_soul_fragment_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHADOWMOURNE_VISUAL_LOW) || !sSpellMgr->GetSpellInfo(SPELL_SHADOWMOURNE_VISUAL_HIGH) || !sSpellMgr->GetSpellInfo(SPELL_SHADOWMOURNE_CHAOS_BANE_BUFF)) return false; @@ -992,14 +992,14 @@ class spell_item_shadowmourne_soul_fragment : public SpellScriptLoader target->RemoveAurasDueToSpell(SPELL_SHADOWMOURNE_VISUAL_HIGH); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_item_shadowmourne_soul_fragment_AuraScript::OnStackChange, EFFECT_0, SPELL_AURA_MOD_STAT, AuraEffectHandleModes(AURA_EFFECT_HANDLE_REAL | AURA_EFFECT_HANDLE_REAPPLY)); AfterEffectRemove += AuraEffectRemoveFn(spell_item_shadowmourne_soul_fragment_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_item_shadowmourne_soul_fragment_AuraScript(); } @@ -1026,7 +1026,7 @@ class spell_item_six_demon_bag : public SpellScriptLoader { PrepareSpellScript(spell_item_six_demon_bag_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_FROSTBOLT) || !sSpellMgr->GetSpellInfo(SPELL_POLYMORPH) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_FELHOUND_MINION) || !sSpellMgr->GetSpellInfo(SPELL_FIREBALL) || !sSpellMgr->GetSpellInfo(SPELL_CHAIN_LIGHTNING) || !sSpellMgr->GetSpellInfo(SPELL_ENVELOPING_WINDS)) return false; @@ -1064,13 +1064,13 @@ class spell_item_six_demon_bag : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_six_demon_bag_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_six_demon_bag_SpellScript(); } @@ -1093,13 +1093,13 @@ class spell_item_the_eye_of_diminution : public SpellScriptLoader amount += diff; } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_item_the_eye_of_diminution_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_THREAT); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_item_the_eye_of_diminution_AuraScript(); } @@ -1123,11 +1123,11 @@ class spell_item_underbelly_elixir : public SpellScriptLoader { PrepareSpellScript(spell_item_underbelly_elixir_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_UNDERBELLY_ELIXIR_TRIGGERED1) || !sSpellMgr->GetSpellInfo(SPELL_UNDERBELLY_ELIXIR_TRIGGERED2) || !sSpellMgr->GetSpellInfo(SPELL_UNDERBELLY_ELIXIR_TRIGGERED3)) return false; @@ -1146,13 +1146,13 @@ class spell_item_underbelly_elixir : public SpellScriptLoader caster->CastSpell(caster, spellId, true, NULL); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_item_underbelly_elixir_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_underbelly_elixir_SpellScript(); } @@ -1174,7 +1174,7 @@ class spell_item_red_rider_air_rifle : public SpellScriptLoader { PrepareSpellScript(spell_item_red_rider_air_rifle_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_AIR_RIFLE_HOLD_VISUAL) || !sSpellMgr->GetSpellInfo(SPELL_AIR_RIFLE_SHOOT) || !sSpellMgr->GetSpellInfo(SPELL_AIR_RIFLE_SHOOT_SELF)) return false; @@ -1198,13 +1198,13 @@ class spell_item_red_rider_air_rifle : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_red_rider_air_rifle_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_red_rider_air_rifle_SpellScript(); } @@ -1249,13 +1249,13 @@ class spell_item_create_heart_candy : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_create_heart_candy_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_create_heart_candy_SpellScript(); } @@ -1270,7 +1270,7 @@ class spell_item_book_of_glyph_mastery : public SpellScriptLoader { PrepareSpellScript(spell_item_book_of_glyph_mastery_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -1296,14 +1296,14 @@ class spell_item_book_of_glyph_mastery : public SpellScriptLoader caster->learnSpell(discoveredSpellId, false); } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_item_book_of_glyph_mastery_SpellScript::CheckRequirement); OnEffectHitTarget += SpellEffectFn(spell_item_book_of_glyph_mastery_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_book_of_glyph_mastery_SpellScript(); } @@ -1337,13 +1337,13 @@ class spell_item_gift_of_the_harvester : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_item_gift_of_the_harvester_SpellScript::CheckRequirement); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_gift_of_the_harvester_SpellScript(); } @@ -1377,13 +1377,13 @@ class spell_item_map_of_the_geyser_fields : public SpellScriptLoader return SPELL_FAILED_CUSTOM_ERROR; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_item_map_of_the_geyser_fields_SpellScript::CheckSinkholes); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_map_of_the_geyser_fields_SpellScript(); } @@ -1405,7 +1405,7 @@ class spell_item_vanquished_clutches : public SpellScriptLoader { PrepareSpellScript(spell_item_vanquished_clutches_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_CRUSHER) || !sSpellMgr->GetSpellInfo(SPELL_CONSTRICTOR) || !sSpellMgr->GetSpellInfo(SPELL_CORRUPTOR)) return false; @@ -1419,13 +1419,13 @@ class spell_item_vanquished_clutches : public SpellScriptLoader caster->CastSpell(caster, spellId, true); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_item_vanquished_clutches_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_vanquished_clutches_SpellScript(); } @@ -1456,7 +1456,7 @@ class spell_item_ashbringer : public SpellScriptLoader { PrepareSpellScript(spell_item_ashbringer_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -1474,13 +1474,13 @@ class spell_item_ashbringer : public SpellScriptLoader player->PlayDirectSound(sound_id, player); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_item_ashbringer_SpellScript::OnDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_ashbringer_SpellScript(); } @@ -1532,13 +1532,13 @@ class spell_magic_eater_food : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_magic_eater_food_AuraScript::HandleTriggerSpell, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_magic_eater_food_AuraScript(); } @@ -1559,13 +1559,13 @@ class spell_item_shimmering_vessel : public SpellScriptLoader target->setDeathState(JUST_RESPAWNED); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_shimmering_vessel_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_shimmering_vessel_SpellScript(); } @@ -1586,12 +1586,12 @@ class spell_item_purify_helboar_meat : public SpellScriptLoader { PrepareSpellScript(spell_item_purify_helboar_meat_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_PURIFIED_HELBOAR_MEAT) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_TOXIC_HELBOAR_MEAT)) return false; @@ -1604,13 +1604,13 @@ class spell_item_purify_helboar_meat : public SpellScriptLoader caster->CastSpell(caster, roll_chance_i(50) ? SPELL_SUMMON_PURIFIED_HELBOAR_MEAT : SPELL_SUMMON_TOXIC_HELBOAR_MEAT, true, NULL); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_purify_helboar_meat_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_purify_helboar_meat_SpellScript(); } @@ -1630,7 +1630,7 @@ class spell_item_crystal_prison_dummy_dnd : public SpellScriptLoader { PrepareSpellScript(spell_item_crystal_prison_dummy_dnd_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sObjectMgr->GetGameObjectTemplate(OBJECT_IMPRISONED_DOOMGUARD)) return false; @@ -1647,13 +1647,13 @@ class spell_item_crystal_prison_dummy_dnd : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_crystal_prison_dummy_dnd_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_crystal_prison_dummy_dnd_SpellScript(); } @@ -1677,7 +1677,7 @@ class spell_item_reindeer_transformation : public SpellScriptLoader { PrepareSpellScript(spell_item_reindeer_transformation_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_FLYING_REINDEER_310) || !sSpellMgr->GetSpellInfo(SPELL_FLYING_REINDEER_280) || !sSpellMgr->GetSpellInfo(SPELL_FLYING_REINDEER_60) || !sSpellMgr->GetSpellInfo(SPELL_REINDEER_100) @@ -1715,13 +1715,13 @@ class spell_item_reindeer_transformation : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_reindeer_transformation_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_reindeer_transformation_SpellScript(); } @@ -1742,7 +1742,7 @@ class spell_item_nigh_invulnerability : public SpellScriptLoader { PrepareSpellScript(spell_item_nigh_invulnerability_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_NIGH_INVULNERABILITY) || !sSpellMgr->GetSpellInfo(SPELL_COMPLETE_VULNERABILITY)) return false; @@ -1761,13 +1761,13 @@ class spell_item_nigh_invulnerability : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_nigh_invulnerability_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_nigh_invulnerability_SpellScript(); } @@ -1788,7 +1788,7 @@ class spell_item_poultryizer : public SpellScriptLoader { PrepareSpellScript(spell_item_poultryizer_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_POULTRYIZER_SUCCESS) || !sSpellMgr->GetSpellInfo(SPELL_POULTRYIZER_BACKFIRE)) return false; @@ -1801,13 +1801,13 @@ class spell_item_poultryizer : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), roll_chance_i(80) ? SPELL_POULTRYIZER_SUCCESS : SPELL_POULTRYIZER_BACKFIRE, true, GetCastItem()); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_poultryizer_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_poultryizer_SpellScript(); } @@ -1828,11 +1828,11 @@ class spell_item_socrethars_stone : public SpellScriptLoader { PrepareSpellScript(spell_item_socrethars_stone_SpellScript); - bool Load() + bool Load() OVERRIDE { return (GetCaster()->GetAreaId() == 3900 || GetCaster()->GetAreaId() == 3742); } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SOCRETHAR_TO_SEAT) || !sSpellMgr->GetSpellInfo(SPELL_SOCRETHAR_FROM_SEAT)) return false; @@ -1855,13 +1855,13 @@ class spell_item_socrethars_stone : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_socrethars_stone_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_socrethars_stone_SpellScript(); } @@ -1883,14 +1883,14 @@ class spell_item_demon_broiled_surprise : public SpellScriptLoader { PrepareSpellScript(spell_item_demon_broiled_surprise_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_CREATE_DEMON_BROILED_SURPRISE) || !sObjectMgr->GetCreatureTemplate(NPC_ABYSSAL_FLAMEBRINGER) || !sObjectMgr->GetQuestTemplate(QUEST_SUPER_HOT_STEW)) return false; return true; } - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -1913,14 +1913,14 @@ class spell_item_demon_broiled_surprise : public SpellScriptLoader return SPELL_FAILED_NOT_HERE; } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_demon_broiled_surprise_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); OnCheckCast += SpellCheckCastFn(spell_item_demon_broiled_surprise_SpellScript::CheckRequirement); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_demon_broiled_surprise_SpellScript(); } @@ -1940,7 +1940,7 @@ class spell_item_complete_raptor_capture : public SpellScriptLoader { PrepareSpellScript(spell_item_complete_raptor_capture_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_RAPTOR_CAPTURE_CREDIT)) return false; @@ -1959,13 +1959,13 @@ class spell_item_complete_raptor_capture : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_complete_raptor_capture_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_complete_raptor_capture_SpellScript(); } @@ -1986,7 +1986,7 @@ class spell_item_impale_leviroth : public SpellScriptLoader { PrepareSpellScript(spell_item_impale_leviroth_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sObjectMgr->GetCreatureTemplate(NPC_LEVIROTH)) return false; @@ -2000,13 +2000,13 @@ class spell_item_impale_leviroth : public SpellScriptLoader target->CastSpell(target, SPELL_LEVIROTH_SELF_IMPALE, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_impale_leviroth_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_impale_leviroth_SpellScript(); } @@ -2031,7 +2031,7 @@ class spell_item_brewfest_mount_transformation : public SpellScriptLoader { PrepareSpellScript(spell_item_brewfest_mount_transformation_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MOUNT_RAM_100) || !sSpellMgr->GetSpellInfo(SPELL_MOUNT_RAM_60) || !sSpellMgr->GetSpellInfo(SPELL_MOUNT_KODO_100) || !sSpellMgr->GetSpellInfo(SPELL_MOUNT_KODO_60)) return false; @@ -2067,13 +2067,13 @@ class spell_item_brewfest_mount_transformation : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_brewfest_mount_transformation_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_brewfest_mount_transformation_SpellScript(); } @@ -2094,14 +2094,14 @@ class spell_item_nitro_boots : public SpellScriptLoader { PrepareSpellScript(spell_item_nitro_boots_SpellScript); - bool Load() + bool Load() OVERRIDE { if (!GetCastItem()) return false; return true; } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_NITRO_BOOTS_SUCCESS) || !sSpellMgr->GetSpellInfo(SPELL_NITRO_BOOTS_BACKFIRE)) return false; @@ -2114,13 +2114,13 @@ class spell_item_nitro_boots : public SpellScriptLoader caster->CastSpell(caster, roll_chance_i(95) ? SPELL_NITRO_BOOTS_SUCCESS : SPELL_NITRO_BOOTS_BACKFIRE, true, GetCastItem()); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_nitro_boots_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_nitro_boots_SpellScript(); } @@ -2141,12 +2141,12 @@ class spell_item_teach_language : public SpellScriptLoader { PrepareSpellScript(spell_item_teach_language_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_LEARN_GNOMISH_BINARY) || !sSpellMgr->GetSpellInfo(SPELL_LEARN_GOBLIN_BINARY)) return false; @@ -2161,13 +2161,13 @@ class spell_item_teach_language : public SpellScriptLoader caster->CastSpell(caster, caster->GetTeam() == ALLIANCE ? SPELL_LEARN_GNOMISH_BINARY : SPELL_LEARN_GOBLIN_BINARY, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_teach_language_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_teach_language_SpellScript(); } @@ -2187,12 +2187,12 @@ class spell_item_rocket_boots : public SpellScriptLoader { PrepareSpellScript(spell_item_rocket_boots_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ROCKET_BOOTS_PROC)) return false; @@ -2216,14 +2216,14 @@ class spell_item_rocket_boots : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_item_rocket_boots_SpellScript::CheckCast); OnEffectHitTarget += SpellEffectFn(spell_item_rocket_boots_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_rocket_boots_SpellScript(); } @@ -2244,7 +2244,7 @@ class spell_item_pygmy_oil : public SpellScriptLoader { PrepareSpellScript(spell_item_pygmy_oil_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PYGMY_OIL_PYGMY_AURA) || !sSpellMgr->GetSpellInfo(SPELL_PYGMY_OIL_SMALLER_AURA)) return false; @@ -2269,13 +2269,13 @@ class spell_item_pygmy_oil : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_pygmy_oil_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_pygmy_oil_SpellScript(); } @@ -2296,13 +2296,13 @@ class spell_item_unusual_compass : public SpellScriptLoader caster->SetFacingTo(frand(0.0f, 2.0f * M_PI)); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_unusual_compass_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_unusual_compass_SpellScript(); } @@ -2325,12 +2325,12 @@ class spell_item_chicken_cover : public SpellScriptLoader { PrepareSpellScript(spell_item_chicken_cover_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_CHICKEN_NET) || !sSpellMgr->GetSpellInfo(SPELL_CAPTURE_CHICKEN_ESCAPE) || !sObjectMgr->GetQuestTemplate(QUEST_CHICKEN_PARTY) || !sObjectMgr->GetQuestTemplate(QUEST_FLOWN_THE_COOP)) return false; @@ -2350,13 +2350,13 @@ class spell_item_chicken_cover : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_chicken_cover_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_chicken_cover_SpellScript(); } @@ -2395,13 +2395,13 @@ class spell_item_refocus : public SpellScriptLoader caster->RemoveSpellCooldown(SPELL_VOLLEY, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_refocus_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_refocus_SpellScript(); } @@ -2423,13 +2423,13 @@ class spell_item_muisek_vessel : public SpellScriptLoader target->DespawnOrUnsummon(); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_muisek_vessel_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_muisek_vessel_SpellScript(); } @@ -2454,13 +2454,13 @@ public: GetCaster()->CastSpell(GetCaster(), SPELL_FORCE_CAST_SUMMON_GNOME_SOUL); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_greatmothers_soulcatcher_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_greatmothers_soulcatcher_SpellScript(); } diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index 46c8c0bd071..680c2e35b35 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -53,7 +53,7 @@ enum MageSpells class spell_mage_incanters_absorbtion_base_AuraScript : public AuraScript { public: - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_INCANTERS_ABSORBTION_TRIGGERED)) return false; @@ -84,7 +84,7 @@ class spell_mage_blast_wave : public SpellScriptLoader { PrepareSpellScript(spell_mage_blast_wave_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_GLYPH_OF_BLAST_WAVE)) return false; @@ -97,13 +97,13 @@ class spell_mage_blast_wave : public SpellScriptLoader PreventHitDefaultEffect(effIndex); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_mage_blast_wave_SpellScript::HandleKnockBack, EFFECT_2, SPELL_EFFECT_KNOCK_BACK); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_mage_blast_wave_SpellScript(); } @@ -119,7 +119,7 @@ class spell_mage_burnout : public SpellScriptLoader { PrepareAuraScript(spell_mage_burnout_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_BURNOUT)) return false; @@ -141,14 +141,14 @@ class spell_mage_burnout : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_MAGE_BURNOUT, SPELLVALUE_BASE_POINT0, mana, GetTarget(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_mage_burnout_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_mage_burnout_AuraScript::HandleProc, EFFECT_1, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mage_burnout_AuraScript(); } @@ -164,7 +164,7 @@ class spell_mage_cold_snap : public SpellScriptLoader { PrepareSpellScript(spell_mage_cold_snap_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -189,13 +189,13 @@ class spell_mage_cold_snap : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_mage_cold_snap_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_mage_cold_snap_SpellScript(); } @@ -212,7 +212,7 @@ class spell_mage_fire_frost_ward : public SpellScriptLoader { PrepareAuraScript(spell_mage_fire_frost_ward_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_FROST_WARDING_TRIGGERED)) return false; @@ -254,7 +254,7 @@ class spell_mage_fire_frost_ward : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mage_fire_frost_ward_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_mage_fire_frost_ward_AuraScript::Absorb, EFFECT_0); @@ -262,7 +262,7 @@ class spell_mage_fire_frost_ward : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mage_fire_frost_ward_AuraScript(); } @@ -278,14 +278,14 @@ class spell_mage_focus_magic : public SpellScriptLoader { PrepareAuraScript(spell_mage_focus_magic_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_FOCUS_MAGIC_PROC)) return false; return true; } - bool Load() + bool Load() OVERRIDE { _procTarget = NULL; return true; @@ -303,7 +303,7 @@ class spell_mage_focus_magic : public SpellScriptLoader GetTarget()->CastSpell(_procTarget, SPELL_MAGE_FOCUS_MAGIC_PROC, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_mage_focus_magic_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_mage_focus_magic_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_MOD_SPELL_CRIT_CHANCE); @@ -313,7 +313,7 @@ class spell_mage_focus_magic : public SpellScriptLoader Unit* _procTarget; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mage_focus_magic_AuraScript(); } @@ -349,14 +349,14 @@ class spell_mage_ice_barrier : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mage_ice_barrier_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); AfterEffectAbsorb += AuraEffectAbsorbFn(spell_mage_ice_barrier_AuraScript::Trigger, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mage_ice_barrier_AuraScript(); } @@ -372,7 +372,7 @@ class spell_mage_ignite : public SpellScriptLoader { PrepareAuraScript(spell_mage_ignite_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_IGNITE)) return false; @@ -396,14 +396,14 @@ class spell_mage_ignite : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_MAGE_IGNITE, SPELLVALUE_BASE_POINT0, amount, eventInfo.GetProcTarget(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_mage_ignite_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_mage_ignite_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mage_ignite_AuraScript(); } @@ -419,7 +419,7 @@ class spell_mage_living_bomb : public SpellScriptLoader { PrepareAuraScript(spell_mage_living_bomb_AuraScript); - bool Validate(SpellInfo const* spell) + bool Validate(SpellInfo const* spell) OVERRIDE { if (!sSpellMgr->GetSpellInfo(uint32(spell->Effects[EFFECT_1].CalcValue()))) return false; @@ -436,13 +436,13 @@ class spell_mage_living_bomb : public SpellScriptLoader caster->CastSpell(GetTarget(), uint32(aurEff->GetAmount()), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_mage_living_bomb_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mage_living_bomb_AuraScript(); } @@ -473,14 +473,14 @@ class spell_mage_mana_shield : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mage_mana_shield_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MANA_SHIELD); AfterEffectManaShield += AuraEffectManaShieldFn(spell_mage_mana_shield_AuraScript::Trigger, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mage_mana_shield_AuraScript(); } @@ -496,7 +496,7 @@ class spell_mage_master_of_elements : public SpellScriptLoader { PrepareAuraScript(spell_mage_master_of_elements_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_MASTER_OF_ELEMENTS_ENERGIZE)) return false; @@ -519,14 +519,14 @@ class spell_mage_master_of_elements : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_MAGE_MASTER_OF_ELEMENTS_ENERGIZE, SPELLVALUE_BASE_POINT0, mana, GetTarget(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_mage_master_of_elements_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_mage_master_of_elements_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mage_master_of_elements_AuraScript(); } @@ -550,7 +550,7 @@ class spell_mage_polymorph_cast_visual : public SpellScriptLoader static const uint32 PolymorhForms[6]; - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { // check if spell ids exist in dbc for (uint32 i = 0; i < 6; ++i) @@ -566,13 +566,13 @@ class spell_mage_polymorph_cast_visual : public SpellScriptLoader target->CastSpell(target, PolymorhForms[urand(0, 5)], true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_mage_polymorph_cast_visual_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_mage_polymorph_cast_visual_SpellScript(); } @@ -598,7 +598,7 @@ class spell_mage_summon_water_elemental : public SpellScriptLoader { PrepareSpellScript(spell_mage_summon_water_elemental_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_GLYPH_OF_ETERNAL_WATER) || !sSpellMgr->GetSpellInfo(SPELL_MAGE_SUMMON_WATER_ELEMENTAL_TEMPORARY) || !sSpellMgr->GetSpellInfo(SPELL_MAGE_SUMMON_WATER_ELEMENTAL_PERMANENT)) return false; @@ -615,13 +615,13 @@ class spell_mage_summon_water_elemental : public SpellScriptLoader caster->CastSpell(caster, SPELL_MAGE_SUMMON_WATER_ELEMENTAL_TEMPORARY, true); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_mage_summon_water_elemental_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_mage_summon_water_elemental_SpellScript(); } diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index 6be2453affb..fa3c6be7f72 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -82,7 +82,7 @@ class spell_pal_ardent_defender : public SpellScriptLoader PAL_SPELL_ARDENT_DEFENDER_HEAL = 66235, }; - bool Load() + bool Load() OVERRIDE { healPct = GetSpellInfo()->Effects[EFFECT_1].CalcValue(); absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(); @@ -128,14 +128,14 @@ class spell_pal_ardent_defender : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_pal_ardent_defender_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_pal_ardent_defender_AuraScript::Absorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pal_ardent_defender_AuraScript(); } @@ -151,7 +151,7 @@ class spell_pal_blessing_of_faith : public SpellScriptLoader { PrepareSpellScript(spell_pal_blessing_of_faith_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_BLESSING_OF_LOWER_CITY_DRUID) || !sSpellMgr->GetSpellInfo(SPELL_PALADIN_BLESSING_OF_LOWER_CITY_PALADIN) || !sSpellMgr->GetSpellInfo(SPELL_PALADIN_BLESSING_OF_LOWER_CITY_PRIEST) || !sSpellMgr->GetSpellInfo(SPELL_PALADIN_BLESSING_OF_LOWER_CITY_SHAMAN)) return false; @@ -185,13 +185,13 @@ class spell_pal_blessing_of_faith : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_pal_blessing_of_faith_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pal_blessing_of_faith_SpellScript(); } @@ -208,7 +208,7 @@ class spell_pal_blessing_of_sanctuary : public SpellScriptLoader { PrepareAuraScript(spell_pal_blessing_of_sanctuary_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_BLESSING_OF_SANCTUARY_BUFF)) return false; @@ -241,7 +241,7 @@ class spell_pal_blessing_of_sanctuary : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_PALADIN_BLESSING_OF_SANCTUARY_ENERGIZE, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_pal_blessing_of_sanctuary_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); AfterEffectRemove += AuraEffectRemoveFn(spell_pal_blessing_of_sanctuary_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); @@ -250,7 +250,7 @@ class spell_pal_blessing_of_sanctuary : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pal_blessing_of_sanctuary_AuraScript(); } @@ -269,7 +269,7 @@ class spell_pal_divine_sacrifice : public SpellScriptLoader uint32 groupSize, minHpPct; int32 remainingAmount; - bool Load() + bool Load() OVERRIDE { if (Unit* caster = GetCaster()) @@ -300,13 +300,13 @@ class spell_pal_divine_sacrifice : public SpellScriptLoader caster->RemoveAura(SPELL_PALADIN_DIVINE_SACRIFICE); } - void Register() + void Register() OVERRIDE { OnEffectSplit += AuraEffectSplitFn(spell_pal_divine_sacrifice_AuraScript::Split, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pal_divine_sacrifice_AuraScript(); } @@ -324,14 +324,14 @@ class spell_pal_divine_storm : public SpellScriptLoader uint32 healPct; - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_DIVINE_STORM_DUMMY)) return false; return true; } - bool Load() + bool Load() OVERRIDE { healPct = GetSpellInfo()->Effects[EFFECT_1].CalcValue(GetCaster()); return true; @@ -343,13 +343,13 @@ class spell_pal_divine_storm : public SpellScriptLoader caster->CastCustomSpell(SPELL_PALADIN_DIVINE_STORM_DUMMY, SPELLVALUE_BASE_POINT0, (GetHitDamage() * healPct) / 100, caster, true); } - void Register() + void Register() OVERRIDE { AfterHit += SpellHitFn(spell_pal_divine_storm_SpellScript::TriggerHeal); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pal_divine_storm_SpellScript(); } @@ -365,7 +365,7 @@ class spell_pal_divine_storm_dummy : public SpellScriptLoader { PrepareSpellScript(spell_pal_divine_storm_dummy_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_DIVINE_STORM_HEAL)) return false; @@ -388,14 +388,14 @@ class spell_pal_divine_storm_dummy : public SpellScriptLoader private: uint32 _targetCount; - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_pal_divine_storm_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pal_divine_storm_dummy_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_RAID); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pal_divine_storm_dummy_SpellScript(); } @@ -425,13 +425,13 @@ class spell_pal_exorcism_and_holy_wrath_damage : public SpellScriptLoader spellMod->value = aurEff->GetAmount(); } - void Register() + void Register() OVERRIDE { DoEffectCalcSpellMod += AuraEffectCalcSpellModFn(spell_pal_exorcism_and_holy_wrath_damage_AuraScript::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pal_exorcism_and_holy_wrath_damage_AuraScript(); } @@ -447,7 +447,7 @@ class spell_pal_eye_for_an_eye : public SpellScriptLoader { PrepareAuraScript(spell_pal_eye_for_an_eye_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_EYE_FOR_AN_EYE_DAMAGE)) return false; @@ -462,13 +462,13 @@ class spell_pal_eye_for_an_eye : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_PALADIN_EYE_FOR_AN_EYE_DAMAGE, SPELLVALUE_BASE_POINT0, damage, eventInfo.GetProcTarget(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { OnEffectProc += AuraEffectProcFn(spell_pal_eye_for_an_eye_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pal_eye_for_an_eye_AuraScript(); } @@ -484,7 +484,7 @@ class spell_pal_guarded_by_the_light : public SpellScriptLoader { PrepareSpellScript(spell_pal_guarded_by_the_light_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_DIVINE_PLEA)) return false; @@ -498,13 +498,13 @@ class spell_pal_guarded_by_the_light : public SpellScriptLoader aura->RefreshDuration(); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_pal_guarded_by_the_light_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pal_guarded_by_the_light_SpellScript(); } @@ -522,7 +522,7 @@ class spell_pal_hand_of_sacrifice : public SpellScriptLoader int32 remainingAmount; - bool Load() + bool Load() OVERRIDE { if (Unit* caster = GetCaster()) { @@ -542,13 +542,13 @@ class spell_pal_hand_of_sacrifice : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectSplit += AuraEffectSplitFn(spell_pal_hand_of_sacrifice_AuraScript::Split, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pal_hand_of_sacrifice_AuraScript(); } @@ -575,13 +575,13 @@ class spell_pal_hand_of_salvation : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_pal_hand_of_salvation_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pal_hand_of_salvation_AuraScript(); } @@ -597,7 +597,7 @@ class spell_pal_holy_shock : public SpellScriptLoader { PrepareSpellScript(spell_pal_holy_shock_SpellScript); - bool Validate(SpellInfo const* spell) + bool Validate(SpellInfo const* spell) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_HOLY_SHOCK_R1)) return false; @@ -645,14 +645,14 @@ class spell_pal_holy_shock : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_pal_holy_shock_SpellScript::CheckCast); OnEffectHitTarget += SpellEffectFn(spell_pal_holy_shock_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pal_holy_shock_SpellScript(); } @@ -675,13 +675,13 @@ class spell_pal_judgement_of_command : public SpellScriptLoader GetCaster()->CastSpell(unitTarget, spell_proto, true, NULL); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_pal_judgement_of_command_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pal_judgement_of_command_SpellScript(); } @@ -697,7 +697,7 @@ class spell_pal_lay_on_hands : public SpellScriptLoader { PrepareSpellScript(spell_pal_lay_on_hands_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_FORBEARANCE)) return false; @@ -730,14 +730,14 @@ class spell_pal_lay_on_hands : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_pal_lay_on_hands_SpellScript::CheckCast); AfterHit += SpellHitFn(spell_pal_lay_on_hands_SpellScript::HandleScript); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pal_lay_on_hands_SpellScript(); } @@ -753,7 +753,7 @@ class spell_pal_righteous_defense : public SpellScriptLoader { PrepareSpellScript(spell_pal_righteous_defense_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_RIGHTEOUS_DEFENSE_TAUNT)) return false; @@ -789,7 +789,7 @@ class spell_pal_righteous_defense : public SpellScriptLoader GetCaster()->CastSpell(target, SPELL_PALADIN_RIGHTEOUS_DEFENSE_TAUNT, true); } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_pal_righteous_defense_SpellScript::CheckCast); //! WORKAROUND @@ -801,7 +801,7 @@ class spell_pal_righteous_defense : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pal_righteous_defense_SpellScript(); } @@ -839,13 +839,13 @@ class spell_pal_sacred_shield : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_pal_sacred_shield_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pal_sacred_shield_AuraScript(); } @@ -861,7 +861,7 @@ class spell_pal_seal_of_righteousness : public SpellScriptLoader { PrepareAuraScript(spell_pal_seal_of_righteousness_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_SEAL_OF_RIGHTEOUSNESS)) return false; @@ -884,14 +884,14 @@ class spell_pal_seal_of_righteousness : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_PALADIN_SEAL_OF_RIGHTEOUSNESS, SPELLVALUE_BASE_POINT0, bp, eventInfo.GetProcTarget(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_pal_seal_of_righteousness_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_pal_seal_of_righteousness_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pal_seal_of_righteousness_AuraScript(); } diff --git a/src/server/scripts/Spells/spell_pet.cpp b/src/server/scripts/Spells/spell_pet.cpp index f7f59bb7e03..b3feac0f081 100644 --- a/src/server/scripts/Spells/spell_pet.cpp +++ b/src/server/scripts/Spells/spell_pet.cpp @@ -95,7 +95,7 @@ class spell_gen_pet_calculate : public SpellScriptLoader { PrepareAuraScript(spell_gen_pet_calculate_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -185,7 +185,7 @@ class spell_gen_pet_calculate : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { switch (m_scriptSpellId) { @@ -214,7 +214,7 @@ class spell_gen_pet_calculate : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_pet_calculate_AuraScript(); } @@ -229,7 +229,7 @@ public: { PrepareAuraScript(spell_warl_pet_scaling_01_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -338,7 +338,7 @@ public: } } - void Register() + void Register() OVERRIDE { OnEffectRemove += AuraEffectRemoveFn(spell_warl_pet_scaling_01_AuraScript::RemoveEffect, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); AfterEffectApply += AuraEffectApplyFn(spell_warl_pet_scaling_01_AuraScript::ApplyEffect, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); @@ -351,7 +351,7 @@ public: uint32 _tempBonus; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_pet_scaling_01_AuraScript(); } @@ -366,7 +366,7 @@ public: { PrepareAuraScript(spell_warl_pet_scaling_02_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -451,7 +451,7 @@ public: } } - void Register() + void Register() OVERRIDE { OnEffectRemove += AuraEffectRemoveFn(spell_warl_pet_scaling_02_AuraScript::RemoveEffect, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); AfterEffectApply += AuraEffectApplyFn(spell_warl_pet_scaling_02_AuraScript::ApplyEffect, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); @@ -464,7 +464,7 @@ public: uint32 _tempBonus; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_pet_scaling_02_AuraScript(); } @@ -479,7 +479,7 @@ public: { PrepareAuraScript(spell_warl_pet_scaling_03_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -522,7 +522,7 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_03_AuraScript::CalculateFrostResistanceAmount, EFFECT_0, SPELL_AURA_MOD_RESISTANCE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_03_AuraScript::CalculateArcaneResistanceAmount, EFFECT_1, SPELL_AURA_MOD_RESISTANCE); @@ -530,7 +530,7 @@ public: } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_pet_scaling_03_AuraScript(); } @@ -546,7 +546,7 @@ public: { PrepareAuraScript(spell_warl_pet_scaling_04_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -565,13 +565,13 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_04_AuraScript::CalculateShadowResistanceAmount, EFFECT_0, SPELL_AURA_MOD_RESISTANCE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_pet_scaling_04_AuraScript(); } @@ -586,7 +586,7 @@ public: { PrepareAuraScript(spell_warl_pet_scaling_05_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -638,7 +638,7 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_05_AuraScript::CalculateAmountMeleeHit, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_05_AuraScript::CalculateAmountSpellHit, EFFECT_1, SPELL_AURA_MOD_SPELL_HIT_CHANCE); @@ -646,7 +646,7 @@ public: } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_pet_scaling_05_AuraScript(); } @@ -661,7 +661,7 @@ public: { PrepareAuraScript(spell_warl_pet_passive_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -712,14 +712,14 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_passive_AuraScript::CalculateAmountCritSpell, EFFECT_0, SPELL_AURA_MOD_SPELL_CRIT_CHANCE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_passive_AuraScript::CalculateAmountCritMelee, EFFECT_1, SPELL_AURA_MOD_WEAPON_CRIT_PERCENT); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_pet_passive_AuraScript(); } @@ -734,7 +734,7 @@ public: { PrepareAuraScript(spell_warl_pet_passive_damage_done_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -763,14 +763,14 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_passive_damage_done_AuraScript::CalculateAmountDamageDone, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_passive_damage_done_AuraScript::CalculateAmountDamageDone, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_pet_passive_damage_done_AuraScript(); } @@ -785,7 +785,7 @@ public: { PrepareAuraScript(spell_warl_pet_passive_voidwalker_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -801,13 +801,13 @@ public: amount += /* aurEff */ect->GetAmount(); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_passive_voidwalker_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_TOTAL_STAT_PERCENTAGE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_pet_passive_voidwalker_AuraScript(); } @@ -823,7 +823,7 @@ public: { PrepareAuraScript(spell_sha_pet_scaling_04_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -860,14 +860,14 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_sha_pet_scaling_04_AuraScript::CalculateAmountMeleeHit, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_sha_pet_scaling_04_AuraScript::CalculateAmountSpellHit, EFFECT_1, SPELL_AURA_MOD_SPELL_HIT_CHANCE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_sha_pet_scaling_04_AuraScript(); } @@ -980,7 +980,7 @@ public: } } - void Register() + void Register() OVERRIDE { OnEffectRemove += AuraEffectRemoveFn(spell_hun_pet_scaling_01_AuraScript::RemoveEffect, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); AfterEffectApply += AuraEffectApplyFn(spell_hun_pet_scaling_01_AuraScript::ApplyEffect, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); @@ -993,7 +993,7 @@ public: uint32 _tempHealth; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_hun_pet_scaling_01_AuraScript(); } @@ -1008,7 +1008,7 @@ public: { PrepareAuraScript(spell_hun_pet_scaling_02_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1072,7 +1072,7 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_02_AuraScript::CalculateFrostResistanceAmount, EFFECT_1, SPELL_AURA_MOD_RESISTANCE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_02_AuraScript::CalculateFireResistanceAmount, EFFECT_0, SPELL_AURA_MOD_RESISTANCE); @@ -1080,7 +1080,7 @@ public: } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_hun_pet_scaling_02_AuraScript(); } @@ -1095,7 +1095,7 @@ public: { PrepareAuraScript(spell_hun_pet_scaling_03_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1159,7 +1159,7 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_03_AuraScript::CalculateShadowResistanceAmount, EFFECT_0, SPELL_AURA_MOD_RESISTANCE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_03_AuraScript::CalculateArcaneResistanceAmount, EFFECT_1, SPELL_AURA_MOD_RESISTANCE); @@ -1167,7 +1167,7 @@ public: } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_hun_pet_scaling_03_AuraScript(); } @@ -1182,7 +1182,7 @@ public: { PrepareAuraScript(spell_hun_pet_scaling_04_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1240,7 +1240,7 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_04_AuraScript::CalculateAmountMeleeHit, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_04_AuraScript::CalculateAmountSpellHit, EFFECT_1, SPELL_AURA_MOD_SPELL_HIT_CHANCE); @@ -1248,7 +1248,7 @@ public: } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_hun_pet_scaling_04_AuraScript(); } @@ -1263,7 +1263,7 @@ public: { PrepareAuraScript(spell_hun_pet_passive_crit_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1312,14 +1312,14 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_passive_crit_AuraScript::CalculateAmountCritSpell, EFFECT_1, SPELL_AURA_MOD_SPELL_CRIT_CHANCE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_passive_crit_AuraScript::CalculateAmountCritMelee, EFFECT_0, SPELL_AURA_MOD_WEAPON_CRIT_PERCENT); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_hun_pet_passive_crit_AuraScript(); } @@ -1334,7 +1334,7 @@ public: { PrepareAuraScript(spell_hun_pet_passive_damage_done_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1371,13 +1371,13 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_passive_damage_done_AuraScript::CalculateAmountDamageDone, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_hun_pet_passive_damage_done_AuraScript(); } @@ -1392,7 +1392,7 @@ public: { PrepareAuraScript(spell_hun_animal_handler_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1412,13 +1412,13 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_animal_handler_AuraScript::CalculateAmountDamageDone, EFFECT_0, SPELL_AURA_MOD_ATTACK_POWER_PCT); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_hun_animal_handler_AuraScript(); } @@ -1434,7 +1434,7 @@ public: { PrepareAuraScript(spell_dk_avoidance_passive_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1457,13 +1457,13 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_avoidance_passive_AuraScript::CalculateAvoidanceAmount, EFFECT_0, SPELL_AURA_MOD_CREATURE_AOE_DAMAGE_AVOIDANCE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_avoidance_passive_AuraScript(); } @@ -1478,7 +1478,7 @@ public: { PrepareAuraScript(spell_dk_pet_scaling_01_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1555,7 +1555,7 @@ public: } } - void Register() + void Register() OVERRIDE { OnEffectRemove += AuraEffectRemoveFn(spell_dk_pet_scaling_01_AuraScript::RemoveEffect, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); AfterEffectApply += AuraEffectApplyFn(spell_dk_pet_scaling_01_AuraScript::ApplyEffect, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); @@ -1567,7 +1567,7 @@ public: uint32 _tempHealth; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_pet_scaling_01_AuraScript(); } @@ -1582,7 +1582,7 @@ public: { PrepareAuraScript(spell_dk_pet_scaling_02_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1604,13 +1604,13 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_02_AuraScript::CalculateAmountMeleeHaste, EFFECT_1, SPELL_AURA_MELEE_SLOW); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_pet_scaling_02_AuraScript(); } @@ -1625,7 +1625,7 @@ public: { PrepareAuraScript(spell_dk_pet_scaling_03_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1666,14 +1666,14 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_03_AuraScript::CalculateAmountMeleeHit, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_03_AuraScript::CalculateAmountSpellHit, EFFECT_1, SPELL_AURA_MOD_SPELL_HIT_CHANCE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_pet_scaling_03_AuraScript(); } @@ -1688,7 +1688,7 @@ public: { PrepareAuraScript(spell_dk_rune_weapon_scaling_02_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1725,14 +1725,14 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_rune_weapon_scaling_02_AuraScript::CalculateDamageDoneAmount, EFFECT_0, SPELL_AURA_MOD_DAMAGE_DONE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_rune_weapon_scaling_02_AuraScript::CalculateAmountMeleeHaste, EFFECT_1, SPELL_AURA_MELEE_SLOW); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_rune_weapon_scaling_02_AuraScript(); } diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index ecaa261663e..cf52909ee3f 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -62,7 +62,7 @@ class spell_pri_divine_aegis : public SpellScriptLoader { PrepareAuraScript(spell_pri_divine_aegis_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_DIVINE_AEGIS)) return false; @@ -89,14 +89,14 @@ class spell_pri_divine_aegis : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_PRIEST_DIVINE_AEGIS, SPELLVALUE_BASE_POINT0, absorb, eventInfo.GetProcTarget(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_pri_divine_aegis_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_pri_divine_aegis_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pri_divine_aegis_AuraScript(); } @@ -112,7 +112,7 @@ class spell_pri_glyph_of_prayer_of_healing : public SpellScriptLoader { PrepareAuraScript(spell_pri_glyph_of_prayer_of_healing_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_GLYPH_OF_PRAYER_OF_HEALING_HEAL)) return false; @@ -128,13 +128,13 @@ class spell_pri_glyph_of_prayer_of_healing : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_PRIEST_GLYPH_OF_PRAYER_OF_HEALING_HEAL, SPELLVALUE_BASE_POINT0, heal, eventInfo.GetProcTarget(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { OnEffectProc += AuraEffectProcFn(spell_pri_glyph_of_prayer_of_healing_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pri_glyph_of_prayer_of_healing_AuraScript(); } @@ -152,14 +152,14 @@ class spell_pri_guardian_spirit : public SpellScriptLoader uint32 healPct; - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_GUARDIAN_SPIRIT_HEAL)) return false; return true; } - bool Load() + bool Load() OVERRIDE { healPct = GetSpellInfo()->Effects[EFFECT_1].CalcValue(); return true; @@ -184,14 +184,14 @@ class spell_pri_guardian_spirit : public SpellScriptLoader absorbAmount = dmgInfo.GetDamage(); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_pri_guardian_spirit_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_pri_guardian_spirit_AuraScript::Absorb, EFFECT_1); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pri_guardian_spirit_AuraScript(); } @@ -217,13 +217,13 @@ class spell_pri_lightwell_renew : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_pri_lightwell_renew_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pri_lightwell_renew_AuraScript(); } @@ -245,13 +245,13 @@ class spell_pri_mana_burn : public SpellScriptLoader unitTarget->RemoveAurasWithMechanic((1 << MECHANIC_FEAR) | (1 << MECHANIC_POLYMORPH)); } - void Register() + void Register() OVERRIDE { AfterHit += SpellHitFn(spell_pri_mana_burn_SpellScript::HandleAfterHit); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pri_mana_burn_SpellScript; } @@ -267,14 +267,14 @@ class spell_pri_mana_leech : public SpellScriptLoader { PrepareAuraScript(spell_pri_mana_leech_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_MANA_LEECH_PROC)) return false; return true; } - bool Load() + bool Load() OVERRIDE { _procTarget = NULL; return true; @@ -292,7 +292,7 @@ class spell_pri_mana_leech : public SpellScriptLoader GetTarget()->CastSpell(_procTarget, SPELL_PRIEST_MANA_LEECH_PROC, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_pri_mana_leech_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_pri_mana_leech_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); @@ -302,7 +302,7 @@ class spell_pri_mana_leech : public SpellScriptLoader Unit* _procTarget; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pri_mana_leech_AuraScript(); } @@ -323,13 +323,13 @@ class spell_pri_mind_sear : public SpellScriptLoader unitList.remove_if(Trinity::ObjectGUIDCheck(GetCaster()->GetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT))); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pri_mind_sear_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pri_mind_sear_SpellScript(); } @@ -353,13 +353,13 @@ class spell_pri_pain_and_suffering_proc : public SpellScriptLoader aur->GetBase()->RefreshDuration(); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_pri_pain_and_suffering_proc_SpellScript::HandleEffectScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pri_pain_and_suffering_proc_SpellScript; } @@ -375,12 +375,12 @@ class spell_pri_penance : public SpellScriptLoader { PrepareSpellScript(spell_pri_penance_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* spellInfo) + bool Validate(SpellInfo const* spellInfo) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_PENANCE_R1)) return false; @@ -423,14 +423,14 @@ class spell_pri_penance : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_pri_penance_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); OnCheckCast += SpellCheckCastFn(spell_pri_penance_SpellScript::CheckCast); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pri_penance_SpellScript; } @@ -446,7 +446,7 @@ class spell_pri_power_word_shield : public SpellScriptLoader { PrepareAuraScript(spell_pri_power_word_shield_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_REFLECTIVE_SHIELD_TRIGGERED)) return false; @@ -499,14 +499,14 @@ class spell_pri_power_word_shield : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_pri_power_word_shield_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); AfterEffectAbsorb += AuraEffectAbsorbFn(spell_pri_power_word_shield_AuraScript::ReflectDamage, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pri_power_word_shield_AuraScript(); } @@ -535,13 +535,13 @@ class spell_pri_prayer_of_mending_heal : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_pri_prayer_of_mending_heal_SpellScript::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pri_prayer_of_mending_heal_SpellScript(); } @@ -557,7 +557,7 @@ class spell_pri_renew : public SpellScriptLoader { PrepareAuraScript(spell_pri_renew_AuraScript); - bool Load() + bool Load() OVERRIDE { return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -578,13 +578,13 @@ class spell_pri_renew : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectApply += AuraEffectApplyFn(spell_pri_renew_AuraScript::HandleApplyEffect, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pri_renew_AuraScript(); } @@ -611,13 +611,13 @@ class spell_pri_shadow_word_death : public SpellScriptLoader GetCaster()->CastCustomSpell(GetCaster(), SPELL_PRIEST_SHADOW_WORD_DEATH, &damage, 0, 0, true); } - void Register() + void Register() OVERRIDE { OnHit += SpellHitFn(spell_pri_shadow_word_death_SpellScript::HandleDamage); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pri_shadow_word_death_SpellScript(); } @@ -633,7 +633,7 @@ class spell_pri_vampiric_touch : public SpellScriptLoader { PrepareAuraScript(spell_pri_vampiric_touch_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_VAMPIRIC_TOUCH_DISPEL)) return false; @@ -652,13 +652,13 @@ class spell_pri_vampiric_touch : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { AfterDispel += AuraDispelFn(spell_pri_vampiric_touch_AuraScript::HandleDispel); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pri_vampiric_touch_AuraScript(); } diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index b75c4995e65..d87278cefc0 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -61,7 +61,7 @@ class spell_generic_quest_update_entry_SpellScript : public SpellScript } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_generic_quest_update_entry_SpellScript::HandleDummy, _effIndex, _spellEffect); } @@ -80,7 +80,7 @@ class spell_q55_sacred_cleansing : public SpellScriptLoader public: spell_q55_sacred_cleansing() : SpellScriptLoader("spell_q55_sacred_cleansing") { } - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_generic_quest_update_entry_SpellScript(SPELL_EFFECT_DUMMY, EFFECT_1, NPC_MORBENT, NPC_WEAKENED_MORBENT, true); } @@ -101,7 +101,7 @@ class spell_q2203_thaumaturgy_channel : public SpellScriptLoader { PrepareAuraScript(spell_q2203_thaumaturgy_channel_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_THAUMATURGY_CHANNEL)) return false; @@ -115,13 +115,13 @@ class spell_q2203_thaumaturgy_channel : public SpellScriptLoader caster->CastSpell(caster, SPELL_THAUMATURGY_CHANNEL, false); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_q2203_thaumaturgy_channel_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_q2203_thaumaturgy_channel_AuraScript(); } @@ -144,12 +144,12 @@ class spell_q5206_test_fetid_skull : public SpellScriptLoader { PrepareSpellScript(spell_q5206_test_fetid_skull_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_CREATE_RESONATING_SKULL) || !sSpellMgr->GetSpellInfo(SPELL_CREATE_BONE_DUST)) return false; @@ -163,13 +163,13 @@ class spell_q5206_test_fetid_skull : public SpellScriptLoader caster->CastSpell(caster, spellId, true, NULL); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_q5206_test_fetid_skull_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q5206_test_fetid_skull_SpellScript(); } @@ -196,7 +196,7 @@ class spell_q6124_6129_apply_salve : public SpellScriptLoader { PrepareSpellScript(spell_q6124_6129_apply_salve_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -227,13 +227,13 @@ class spell_q6124_6129_apply_salve : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q6124_6129_apply_salve_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q6124_6129_apply_salve_SpellScript(); } @@ -252,7 +252,7 @@ class spell_q10255_administer_antidote : public SpellScriptLoader public: spell_q10255_administer_antidote() : SpellScriptLoader("spell_q10255_administer_antidote") { } - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_generic_quest_update_entry_SpellScript(SPELL_EFFECT_DUMMY, EFFECT_0, NPC_HELBOAR, NPC_DREADTUSK, true); } @@ -288,7 +288,7 @@ class spell_q11396_11399_force_shield_arcane_purple_x3 : public SpellScriptLoade GetTarget()->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); } - void Register() + void Register() OVERRIDE { OnEffectApply += AuraEffectApplyFn(spell_q11396_11399_force_shield_arcane_purple_x3_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectRemove += AuraEffectRemoveFn(spell_q11396_11399_force_shield_arcane_purple_x3_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); @@ -296,7 +296,7 @@ class spell_q11396_11399_force_shield_arcane_purple_x3 : public SpellScriptLoade }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_q11396_11399_force_shield_arcane_purple_x3_AuraScript(); } @@ -312,7 +312,7 @@ class spell_q11396_11399_scourging_crystal_controller : public SpellScriptLoader { PrepareSpellScript(spell_q11396_11399_scourging_crystal_controller_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_FORCE_SHIELD_ARCANE_PURPLE_X3) || !sSpellMgr->GetSpellInfo(SPELL_SCOURGING_CRYSTAL_CONTROLLER)) return false; @@ -328,13 +328,13 @@ class spell_q11396_11399_scourging_crystal_controller : public SpellScriptLoader GetCaster()->CastSpell(target, SPELL_SCOURGING_CRYSTAL_CONTROLLER, true, GetCastItem()); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q11396_11399_scourging_crystal_controller_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q11396_11399_scourging_crystal_controller_SpellScript(); }; @@ -350,7 +350,7 @@ class spell_q11396_11399_scourging_crystal_controller_dummy : public SpellScript { PrepareSpellScript(spell_q11396_11399_scourging_crystal_controller_dummy_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_FORCE_SHIELD_ARCANE_PURPLE_X3)) return false; @@ -364,13 +364,13 @@ class spell_q11396_11399_scourging_crystal_controller_dummy : public SpellScript target->RemoveAurasDueToSpell(SPELL_FORCE_SHIELD_ARCANE_PURPLE_X3); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q11396_11399_scourging_crystal_controller_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q11396_11399_scourging_crystal_controller_dummy_SpellScript(); }; @@ -389,7 +389,7 @@ class spell_q11515_fel_siphon_dummy : public SpellScriptLoader public: spell_q11515_fel_siphon_dummy() : SpellScriptLoader("spell_q11515_fel_siphon_dummy") { } - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_generic_quest_update_entry_SpellScript(SPELL_EFFECT_DUMMY, EFFECT_0, NPC_FELBLOOD_INITIATE, NPC_EMACIATED_FELBLOOD, true); } @@ -413,7 +413,7 @@ class spell_q11587_arcane_prisoner_rescue : public SpellScriptLoader { PrepareSpellScript(spell_q11587_arcane_prisoner_rescue_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_ARCANE_PRISONER_MALE) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_ARCANE_PRISONER_FEMALE) || !sSpellMgr->GetSpellInfo(SPELL_ARCANE_PRISONER_KILL_CREDIT)) return false; @@ -433,13 +433,13 @@ class spell_q11587_arcane_prisoner_rescue : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q11587_arcane_prisoner_rescue_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q11587_arcane_prisoner_rescue_SpellScript(); } @@ -471,12 +471,12 @@ class spell_q11730_ultrasonic_screwdriver : public SpellScriptLoader { PrepareSpellScript(spell_q11730_ultrasonic_screwdriver_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER && GetCastItem(); } - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_SCAVENGEBOT_004A8) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_SENTRYBOT_57K) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_DEFENDOTANK_66D) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_SCAVENGEBOT_005B6) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_55D_COLLECTATRON) || !sSpellMgr->GetSpellInfo(SPELL_ROBOT_KILL_CREDIT)) return false; @@ -506,13 +506,13 @@ class spell_q11730_ultrasonic_screwdriver : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q11730_ultrasonic_screwdriver_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q11730_ultrasonic_screwdriver_SpellScript(); } @@ -557,13 +557,13 @@ class spell_q12459_seeds_of_natures_wrath : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q12459_seeds_of_natures_wrath_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12459_seeds_of_natures_wrath_SpellScript(); } @@ -588,7 +588,7 @@ class spell_q12634_despawn_fruit_tosser : public SpellScriptLoader { PrepareSpellScript(spell_q12634_despawn_fruit_tosser_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_BANANAS_FALL_TO_GROUND) || !sSpellMgr->GetSpellInfo(SPELL_ORANGE_FALLS_TO_GROUND) || !sSpellMgr->GetSpellInfo(SPELL_PAPAYA_FALLS_TO_GROUND) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_ADVENTUROUS_DWARF)) return false; @@ -609,13 +609,13 @@ class spell_q12634_despawn_fruit_tosser : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), spellId, true, NULL); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_q12634_despawn_fruit_tosser_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12634_despawn_fruit_tosser_SpellScript(); } @@ -644,13 +644,13 @@ class spell_q12683_take_sputum_sample : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_q12683_take_sputum_sample_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12683_take_sputum_sample_SpellScript(); } @@ -705,14 +705,14 @@ class spell_q12851_going_bearback : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_q12851_going_bearback_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_q12851_going_bearback_AuraScript(); } @@ -735,12 +735,12 @@ class spell_q12937_relief_for_the_fallen : public SpellScriptLoader { PrepareSpellScript(spell_q12937_relief_for_the_fallen_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_TRIGGER_AID_OF_THE_EARTHEN)) return false; @@ -758,13 +758,13 @@ class spell_q12937_relief_for_the_fallen : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q12937_relief_for_the_fallen_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12937_relief_for_the_fallen_SpellScript(); } @@ -786,7 +786,7 @@ class spell_q10041_q10040_who_are_they : public SpellScriptLoader { PrepareSpellScript(spell_q10041_q10040_who_are_they_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MALE_DISGUISE) || !sSpellMgr->GetSpellInfo(SPELL_FEMALE_DISGUISE) || !sSpellMgr->GetSpellInfo(SPELL_GENERIC_DISGUISE)) return false; @@ -803,13 +803,13 @@ class spell_q10041_q10040_who_are_they : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q10041_q10040_who_are_they_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q10041_q10040_who_are_they_SpellScript(); } @@ -845,13 +845,13 @@ class spell_symbol_of_life_dummy : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_symbol_of_life_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_symbol_of_life_dummy_SpellScript(); }; @@ -873,7 +873,7 @@ class spell_q12659_ahunaes_knife : public SpellScriptLoader { PrepareSpellScript(spell_q12659_ahunaes_knife_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -888,13 +888,13 @@ class spell_q12659_ahunaes_knife : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q12659_ahunaes_knife_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12659_ahunaes_knife_SpellScript(); }; @@ -917,7 +917,7 @@ class spell_q9874_liquid_fire : public SpellScriptLoader { PrepareSpellScript(spell_q9874_liquid_fire_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -934,13 +934,13 @@ class spell_q9874_liquid_fire : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q9874_liquid_fire_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q9874_liquid_fire_SpellScript(); }; @@ -962,7 +962,7 @@ class spell_q12805_lifeblood_dummy : public SpellScriptLoader { PrepareSpellScript(spell_q12805_lifeblood_dummy_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -978,13 +978,13 @@ class spell_q12805_lifeblood_dummy : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q12805_lifeblood_dummy_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12805_lifeblood_dummy_SpellScript(); }; @@ -1018,13 +1018,13 @@ class spell_q13280_13283_plant_battle_standard: public SpellScriptLoader player->ToPlayer()->KilledMonsterCredit(NPC_KING_OF_THE_MOUNTAINT_KC, 0); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_q13280_13283_plant_battle_standard_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q13280_13283_plant_battle_standard_SpellScript(); } @@ -1047,7 +1047,7 @@ class spell_q14112_14145_chum_the_water: public SpellScriptLoader { PrepareSpellScript(spell_q14112_14145_chum_the_water_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SUMMON_ANGRY_KVALDIR) || !sSpellMgr->GetSpellInfo(SUMMON_NORTH_SEA_MAKO) || !sSpellMgr->GetSpellInfo(SUMMON_NORTH_SEA_THRESHER) || !sSpellMgr->GetSpellInfo(SUMMON_NORTH_SEA_BLUE_SHARK)) return false; @@ -1060,13 +1060,13 @@ class spell_q14112_14145_chum_the_water: public SpellScriptLoader caster->CastSpell(caster, RAND(SUMMON_ANGRY_KVALDIR, SUMMON_NORTH_SEA_MAKO, SUMMON_NORTH_SEA_THRESHER, SUMMON_NORTH_SEA_BLUE_SHARK)); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q14112_14145_chum_the_water_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q14112_14145_chum_the_water_SpellScript(); } @@ -1089,7 +1089,7 @@ class spell_q9452_cast_net: public SpellScriptLoader { PrepareSpellScript(spell_q9452_cast_net_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -1103,13 +1103,13 @@ class spell_q9452_cast_net: public SpellScriptLoader caster->CastSpell(caster, SPELL_NEW_SUMMON_TEST, true); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_q9452_cast_net_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q9452_cast_net_SpellScript(); } @@ -1143,13 +1143,13 @@ public: } } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_q12987_read_pronouncement_AuraScript::OnApply, EFFECT_0, SPELL_AURA_NONE, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_q12987_read_pronouncement_AuraScript(); } @@ -1200,13 +1200,13 @@ class spell_q12277_wintergarde_mine_explosion : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q12277_wintergarde_mine_explosion_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12277_wintergarde_mine_explosion_SpellScript(); } @@ -1232,13 +1232,13 @@ public: target->CastSpell(GetCaster(), SPELL_BUNNY_CREDIT_BEAM, false); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q12066_bunny_kill_credit_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12066_bunny_kill_credit_SpellScript(); } @@ -1283,13 +1283,13 @@ class spell_q12735_song_of_cleansing : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q12735_song_of_cleansing_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12735_song_of_cleansing_SpellScript(); } @@ -1314,13 +1314,13 @@ class spell_q12372_cast_from_gossip_trigger : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_SUMMON_WYRMREST_DEFENDER, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q12372_cast_from_gossip_trigger_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12372_cast_from_gossip_trigger_SpellScript(); } @@ -1355,13 +1355,13 @@ class spell_q12372_destabilize_azure_dragonshrine_dummy : public SpellScriptLoad player->KilledMonsterCredit(NPC_WYRMREST_TEMPLE_CREDIT, 0); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q12372_destabilize_azure_dragonshrine_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12372_destabilize_azure_dragonshrine_dummy_SpellScript(); } @@ -1383,13 +1383,13 @@ class spell_q12372_azure_on_death_force_whisper : public SpellScriptLoader defender->AI()->Talk(WHISPER_ON_HIT_BY_FORCE_WHISPER, defender->GetCharmerOrOwnerGUID()); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q12372_azure_on_death_force_whisper_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12372_azure_on_death_force_whisper_SpellScript(); } @@ -1423,13 +1423,13 @@ class spell_q11010_q11102_q11023_aggro_check_aura : public SpellScriptLoader target->CastSpell(target, SPELL_AGGRO_CHECK); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_q11010_q11102_q11023_aggro_check_aura_AuraScript::HandleTriggerSpell, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_q11010_q11102_q11023_aggro_check_aura_AuraScript(); } @@ -1453,13 +1453,13 @@ class spell_q11010_q11102_q11023_aggro_check : public SpellScriptLoader playerTarget->CastSpell(playerTarget, SPELL_FLAK_CANNON_TRIGGER, TRIGGERED_IGNORE_CASTER_MOUNTED_OR_ON_VEHICLE); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q11010_q11102_q11023_aggro_check_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q11010_q11102_q11023_aggro_check_SpellScript(); } @@ -1482,13 +1482,13 @@ class spell_q11010_q11102_q11023_aggro_burst : public SpellScriptLoader target->CastSpell(target, SPELL_CHOOSE_LOC); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_q11010_q11102_q11023_aggro_burst_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_q11010_q11102_q11023_aggro_burst_AuraScript(); } @@ -1519,13 +1519,13 @@ class spell_q11010_q11102_q11023_choose_loc : public SpellScriptLoader caster->SummonCreature(NPC_FEL_CANNON2, (*itr)->GetPositionX(), (*itr)->GetPositionY(), (*itr)->GetPositionZ()); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_q11010_q11102_q11023_choose_loc_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q11010_q11102_q11023_choose_loc_SpellScript(); } @@ -1551,13 +1551,13 @@ class spell_q11010_q11102_q11023_q11008_check_fly_mount : public SpellScriptLoad return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_q11010_q11102_q11023_q11008_check_fly_mount_SpellScript::CheckRequirement); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q11010_q11102_q11023_q11008_check_fly_mount_SpellScript(); } @@ -1577,7 +1577,7 @@ class spell_q12527_zuldrak_rat : public SpellScriptLoader { PrepareSpellScript(spell_q12527_zuldrak_rat_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_GORGED_LURKING_BASILISK)) return false; @@ -1594,13 +1594,13 @@ class spell_q12527_zuldrak_rat : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q12527_zuldrak_rat_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12527_zuldrak_rat_SpellScript(); } @@ -1625,13 +1625,13 @@ class spell_q12661_q12669_q12676_q12677_q12713_summon_stefan : public SpellScrip GetHitDest()->RelocateOffset(offset); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_q12661_q12669_q12676_q12677_q12713_summon_stefan_SpellScript::ChangeSummonPos, EFFECT_0, SPELL_EFFECT_SUMMON); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12661_q12669_q12676_q12677_q12713_summon_stefan_SpellScript(); } @@ -1651,7 +1651,7 @@ class spell_q12730_quenching_mist : public SpellScriptLoader { PrepareAuraScript(spell_q12730_quenching_mist_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_FLICKERING_FLAMES)) return false; @@ -1663,13 +1663,13 @@ class spell_q12730_quenching_mist : public SpellScriptLoader GetTarget()->RemoveAurasDueToSpell(SPELL_FLICKERING_FLAMES); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_q12730_quenching_mist_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_q12730_quenching_mist_AuraScript(); } @@ -1694,7 +1694,7 @@ class spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy : public { PrepareSpellScript(spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_RIDE)) return false; @@ -1711,13 +1711,13 @@ class spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy : public GetHitCreature()->CastSpell(GetCaster(), SPELL_RIDE, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy_SpellScript(); } @@ -1742,13 +1742,13 @@ class spell_q13291_q13292_q13239_q13261_armored_decoy_summon_skytalon : public S GetHitDest()->RelocateOffset(offset); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_q13291_q13292_q13239_q13261_armored_decoy_summon_skytalon_SpellScript::ChangeSummonPos, EFFECT_0, SPELL_EFFECT_SUMMON); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q13291_q13292_q13239_q13261_armored_decoy_summon_skytalon_SpellScript(); } @@ -1773,7 +1773,7 @@ class spell_q12847_summon_soul_moveto_bunny : public SpellScriptLoader GetHitDest()->RelocateOffset(offset); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_q12847_summon_soul_moveto_bunny_SpellScript::ChangeSummonPos, EFFECT_0, SPELL_EFFECT_SUMMON); } diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index 541bed71637..299773a5d0f 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -47,14 +47,14 @@ class spell_rog_blade_flurry : public SpellScriptLoader { PrepareAuraScript(spell_rog_blade_flurry_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ROGUE_BLADE_FLURRY_EXTRA_ATTACK)) return false; return true; } - bool Load() + bool Load() OVERRIDE { _procTarget = NULL; return true; @@ -76,7 +76,7 @@ class spell_rog_blade_flurry : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_rog_blade_flurry_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_rog_blade_flurry_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_MOD_MELEE_HASTE); @@ -86,7 +86,7 @@ class spell_rog_blade_flurry : public SpellScriptLoader Unit* _procTarget; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_rog_blade_flurry_AuraScript(); } @@ -104,14 +104,14 @@ class spell_rog_cheat_death : public SpellScriptLoader uint32 absorbChance; - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ROGUE_CHEAT_DEATH_COOLDOWN)) return false; return true; } - bool Load() + bool Load() OVERRIDE { absorbChance = GetSpellInfo()->Effects[EFFECT_0].CalcValue(); return GetUnitOwner()->ToPlayer(); @@ -142,14 +142,14 @@ class spell_rog_cheat_death : public SpellScriptLoader absorbAmount = dmgInfo.GetDamage(); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_rog_cheat_death_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_rog_cheat_death_AuraScript::Absorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_rog_cheat_death_AuraScript(); } @@ -165,7 +165,7 @@ class spell_rog_deadly_poison : public SpellScriptLoader { PrepareSpellScript(spell_rog_deadly_poison_SpellScript); - bool Load() + bool Load() OVERRIDE { _stackAmount = 0; // at this point CastItem must already be initialized @@ -234,7 +234,7 @@ class spell_rog_deadly_poison : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { BeforeHit += SpellHitFn(spell_rog_deadly_poison_SpellScript::HandleBeforeHit); AfterHit += SpellHitFn(spell_rog_deadly_poison_SpellScript::HandleAfterHit); @@ -243,7 +243,7 @@ class spell_rog_deadly_poison : public SpellScriptLoader uint8 _stackAmount; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_rog_deadly_poison_SpellScript(); } @@ -261,7 +261,7 @@ class spell_rog_nerves_of_steel : public SpellScriptLoader uint32 absorbPct; - bool Load() + bool Load() OVERRIDE { absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster()); return true; @@ -280,14 +280,14 @@ class spell_rog_nerves_of_steel : public SpellScriptLoader absorbAmount = CalculatePct(dmgInfo.GetDamage(), absorbPct); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_rog_nerves_of_steel_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_rog_nerves_of_steel_AuraScript::Absorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_rog_nerves_of_steel_AuraScript(); } @@ -303,12 +303,12 @@ class spell_rog_preparation : public SpellScriptLoader { PrepareSpellScript(spell_rog_preparation_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ROGUE_GLYPH_OF_PREPARATION)) return false; @@ -348,13 +348,13 @@ class spell_rog_preparation : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_rog_preparation_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_rog_preparation_SpellScript(); } @@ -370,7 +370,7 @@ class spell_rog_prey_on_the_weak : public SpellScriptLoader { PrepareAuraScript(spell_rog_prey_on_the_weak_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ROGUE_PREY_ON_THE_WEAK)) return false; @@ -393,13 +393,13 @@ class spell_rog_prey_on_the_weak : public SpellScriptLoader target->RemoveAurasDueToSpell(SPELL_ROGUE_PREY_ON_THE_WEAK); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_rog_prey_on_the_weak_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_rog_prey_on_the_weak_AuraScript(); } @@ -415,7 +415,7 @@ class spell_rog_rupture : public SpellScriptLoader { PrepareAuraScript(spell_rog_rupture_AuraScript); - bool Load() + bool Load() OVERRIDE { Unit* caster = GetCaster(); return caster && caster->GetTypeId() == TYPEID_PLAYER; @@ -445,13 +445,13 @@ class spell_rog_rupture : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_rog_rupture_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_rog_rupture_AuraScript(); } @@ -467,12 +467,12 @@ class spell_rog_shiv : public SpellScriptLoader { PrepareSpellScript(spell_rog_shiv_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ROGUE_SHIV_TRIGGERED)) return false; @@ -486,13 +486,13 @@ class spell_rog_shiv : public SpellScriptLoader caster->CastSpell(unitTarget, SPELL_ROGUE_SHIV_TRIGGERED, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_rog_shiv_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_rog_shiv_SpellScript(); } @@ -508,7 +508,7 @@ class spell_rog_tricks_of_the_trade : public SpellScriptLoader { PrepareAuraScript(spell_rog_tricks_of_the_trade_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ROGUE_TRICKS_OF_THE_TRADE_DMG_BOOST)) return false; @@ -517,7 +517,7 @@ class spell_rog_tricks_of_the_trade : public SpellScriptLoader return true; } - bool Load() + bool Load() OVERRIDE { _redirectTarget = NULL; return true; @@ -545,7 +545,7 @@ class spell_rog_tricks_of_the_trade : public SpellScriptLoader Remove(AURA_REMOVE_BY_DEFAULT); // maybe handle by proc charges } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_rog_tricks_of_the_trade_AuraScript::OnRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); DoCheckProc += AuraCheckProcFn(spell_rog_tricks_of_the_trade_AuraScript::CheckProc); @@ -556,7 +556,7 @@ class spell_rog_tricks_of_the_trade : public SpellScriptLoader Unit* _redirectTarget; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_rog_tricks_of_the_trade_AuraScript(); } @@ -577,13 +577,13 @@ class spell_rog_tricks_of_the_trade_proc : public SpellScriptLoader GetTarget()->ResetRedirectThreat(); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_rog_tricks_of_the_trade_proc_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_rog_tricks_of_the_trade_proc_AuraScript(); } diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index 2cb1b49f245..69e02a37272 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -69,7 +69,7 @@ class spell_sha_ancestral_awakening_proc : public SpellScriptLoader { PrepareSpellScript(spell_sha_ancestral_awakening_proc_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_ANCESTRAL_AWAKENING_PROC)) return false; @@ -83,13 +83,13 @@ class spell_sha_ancestral_awakening_proc : public SpellScriptLoader GetCaster()->CastCustomSpell(GetHitUnit(), SPELL_SHAMAN_ANCESTRAL_AWAKENING_PROC, &damage, NULL, NULL, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_sha_ancestral_awakening_proc_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_sha_ancestral_awakening_proc_SpellScript(); } @@ -107,7 +107,7 @@ class spell_sha_astral_shift : public SpellScriptLoader uint32 absorbPct; - bool Load() + bool Load() OVERRIDE { absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster()); return true; @@ -126,14 +126,14 @@ class spell_sha_astral_shift : public SpellScriptLoader absorbAmount = CalculatePct(dmgInfo.GetDamage(), absorbPct); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_sha_astral_shift_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_sha_astral_shift_AuraScript::Absorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_sha_astral_shift_AuraScript(); } @@ -149,7 +149,7 @@ class spell_sha_bloodlust : public SpellScriptLoader { PrepareSpellScript(spell_sha_bloodlust_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_SATED)) return false; @@ -167,7 +167,7 @@ class spell_sha_bloodlust : public SpellScriptLoader target->CastSpell(target, SPELL_SHAMAN_SATED, true); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_bloodlust_SpellScript::RemoveInvalidTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_RAID); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_bloodlust_SpellScript::RemoveInvalidTargets, EFFECT_1, TARGET_UNIT_CASTER_AREA_RAID); @@ -176,7 +176,7 @@ class spell_sha_bloodlust : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_sha_bloodlust_SpellScript(); } @@ -192,7 +192,7 @@ class spell_sha_chain_heal : public SpellScriptLoader { PrepareSpellScript(spell_sha_chain_heal_SpellScript); - bool Load() + bool Load() OVERRIDE { firstHeal = true; riptide = false; @@ -217,7 +217,7 @@ class spell_sha_chain_heal : public SpellScriptLoader SetHitHeal(GetHitHeal() * 1.25f); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_sha_chain_heal_SpellScript::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); } @@ -226,7 +226,7 @@ class spell_sha_chain_heal : public SpellScriptLoader bool riptide; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_sha_chain_heal_SpellScript(); } @@ -242,7 +242,7 @@ class spell_sha_cleansing_totem_pulse : public SpellScriptLoader { PrepareSpellScript(spell_sha_cleansing_totem_pulse_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_CLEANSING_TOTEM_EFFECT)) return false; @@ -256,13 +256,13 @@ class spell_sha_cleansing_totem_pulse : public SpellScriptLoader GetCaster()->CastCustomSpell(GetHitUnit(), SPELL_SHAMAN_CLEANSING_TOTEM_EFFECT, NULL, &bp, NULL, true, NULL, NULL, GetOriginalCaster()->GetGUID()); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_sha_cleansing_totem_pulse_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_sha_cleansing_totem_pulse_SpellScript(); } @@ -278,7 +278,7 @@ class spell_sha_earth_shield : public SpellScriptLoader { PrepareAuraScript(spell_sha_earth_shield_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_EARTH_SHIELD_HEAL)) return false; @@ -317,14 +317,14 @@ class spell_sha_earth_shield : public SpellScriptLoader player->AddSpellCooldown(SPELL_SHAMAN_EARTH_SHIELD_HEAL, 0, time(NULL) + 3); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_sha_earth_shield_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_DUMMY); OnEffectProc += AuraEffectProcFn(spell_sha_earth_shield_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_sha_earth_shield_AuraScript(); } @@ -340,7 +340,7 @@ class spell_sha_earthbind_totem : public SpellScriptLoader { PrepareAuraScript(spell_sha_earthbind_totem_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_TOTEM_EARTHBIND_TOTEM) || !sSpellMgr->GetSpellInfo(SPELL_SHAMAN_TOTEM_EARTHEN_POWER)) return false; @@ -372,14 +372,14 @@ class spell_sha_earthbind_totem : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_sha_earthbind_totem_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); OnEffectApply += AuraEffectApplyFn(spell_sha_earthbind_totem_AuraScript::Apply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_sha_earthbind_totem_AuraScript(); } @@ -417,13 +417,13 @@ class spell_sha_earthen_power : public SpellScriptLoader unitList.remove_if(EarthenPowerTargetSelector()); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_earthen_power_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_sha_earthen_power_SpellScript(); } @@ -439,7 +439,7 @@ class spell_sha_fire_nova : public SpellScriptLoader { PrepareSpellScript(spell_sha_fire_nova_SpellScript); - bool Validate(SpellInfo const* spellInfo) + bool Validate(SpellInfo const* spellInfo) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_FIRE_NOVA_R1) || sSpellMgr->GetFirstSpellInChain(SPELL_SHAMAN_FIRE_NOVA_R1) != sSpellMgr->GetFirstSpellInChain(spellInfo->Id)) return false; @@ -476,14 +476,14 @@ class spell_sha_fire_nova : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_sha_fire_nova_SpellScript::CheckFireTotem); OnEffectHitTarget += SpellEffectFn(spell_sha_fire_nova_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_sha_fire_nova_SpellScript(); } @@ -499,7 +499,7 @@ class spell_sha_flame_shock : public SpellScriptLoader { PrepareAuraScript(spell_sha_flame_shock_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_LAVA_FLOWS_R1)) return false; @@ -522,13 +522,13 @@ class spell_sha_flame_shock : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { AfterDispel += AuraDispelFn(spell_sha_flame_shock_AuraScript::HandleDispel); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_sha_flame_shock_AuraScript(); } @@ -544,7 +544,7 @@ class spell_sha_healing_stream_totem : public SpellScriptLoader { PrepareSpellScript(spell_sha_healing_stream_totem_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_GLYPH_OF_HEALING_STREAM_TOTEM) || !sSpellMgr->GetSpellInfo(SPELL_SHAMAN_TOTEM_HEALING_STREAM_HEAL)) return false; @@ -577,13 +577,13 @@ class spell_sha_healing_stream_totem : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_sha_healing_stream_totem_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_sha_healing_stream_totem_SpellScript(); } @@ -599,7 +599,7 @@ class spell_sha_heroism : public SpellScriptLoader { PrepareSpellScript(spell_sha_heroism_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_EXHAUSTION)) return false; @@ -617,7 +617,7 @@ class spell_sha_heroism : public SpellScriptLoader target->CastSpell(target, SPELL_SHAMAN_EXHAUSTION, true); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_heroism_SpellScript::RemoveInvalidTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_RAID); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_heroism_SpellScript::RemoveInvalidTargets, EFFECT_1, TARGET_UNIT_CASTER_AREA_RAID); @@ -626,7 +626,7 @@ class spell_sha_heroism : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_sha_heroism_SpellScript(); } @@ -642,7 +642,7 @@ class spell_sha_lava_lash : public SpellScriptLoader { PrepareSpellScript(spell_sha_lava_lash_SpellScript) - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -663,14 +663,14 @@ class spell_sha_lava_lash : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_sha_lava_lash_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_sha_lava_lash_SpellScript(); } @@ -686,7 +686,7 @@ class spell_sha_mana_spring_totem : public SpellScriptLoader { PrepareSpellScript(spell_sha_mana_spring_totem_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_MANA_SPRING_TOTEM_ENERGIZE)) return false; @@ -702,14 +702,14 @@ class spell_sha_mana_spring_totem : public SpellScriptLoader caster->CastCustomSpell(target, SPELL_SHAMAN_MANA_SPRING_TOTEM_ENERGIZE, &damage, 0, 0, true, 0, 0, GetOriginalCaster()->GetGUID()); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_sha_mana_spring_totem_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_sha_mana_spring_totem_SpellScript(); } @@ -725,7 +725,7 @@ class spell_sha_mana_tide_totem : public SpellScriptLoader { PrepareSpellScript(spell_sha_mana_tide_totem_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_GLYPH_OF_MANA_TIDE) || !sSpellMgr->GetSpellInfo(SPELL_SHAMAN_MANA_TIDE_TOTEM)) return false; @@ -751,13 +751,13 @@ class spell_sha_mana_tide_totem : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_sha_mana_tide_totem_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_sha_mana_tide_totem_SpellScript(); } @@ -773,7 +773,7 @@ class spell_sha_sentry_totem : public SpellScriptLoader { PrepareAuraScript(spell_sha_sentry_totem_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_BIND_SIGHT)) return false; @@ -795,14 +795,14 @@ class spell_sha_sentry_totem : public SpellScriptLoader caster->ToPlayer()->StopCastingBindSight(); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_sha_sentry_totem_AuraScript::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_sha_sentry_totem_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_sha_sentry_totem_AuraScript(); } @@ -825,13 +825,13 @@ class spell_sha_thunderstorm : public SpellScriptLoader PreventHitDefaultEffect(effIndex); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_sha_thunderstorm_SpellScript::HandleKnockBack, EFFECT_2, SPELL_EFFECT_KNOCK_BACK); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_sha_thunderstorm_SpellScript(); } diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index 0c9af2e3804..be060e32030 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -70,7 +70,7 @@ class spell_warl_banish : public SpellScriptLoader { PrepareSpellScript(spell_warl_banish_SpellScript); - bool Load() + bool Load() OVERRIDE { _removed = false; return true; @@ -97,7 +97,7 @@ class spell_warl_banish : public SpellScriptLoader PreventHitAura(); } - void Register() + void Register() OVERRIDE { BeforeHit += SpellHitFn(spell_warl_banish_SpellScript::HandleBanish); AfterHit += SpellHitFn(spell_warl_banish_SpellScript::RemoveAura); @@ -106,7 +106,7 @@ class spell_warl_banish : public SpellScriptLoader bool _removed; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warl_banish_SpellScript(); } @@ -124,7 +124,7 @@ class spell_warl_create_healthstone : public SpellScriptLoader static uint32 const iTypes[8][3]; - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_IMPROVED_HEALTHSTONE_R1) || !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_IMPROVED_HEALTHSTONE_R2)) return false; @@ -171,14 +171,14 @@ class spell_warl_create_healthstone : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warl_create_healthstone_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnCheckCast += SpellCheckCastFn(spell_warl_create_healthstone_SpellScript::CheckCast); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warl_create_healthstone_SpellScript(); } @@ -205,14 +205,14 @@ class spell_warl_curse_of_doom : public SpellScriptLoader { PrepareAuraScript(spell_warl_curse_of_doom_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_CURSE_OF_DOOM_EFFECT)) return false; return true; } - bool Load() + bool Load() OVERRIDE { return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -230,13 +230,13 @@ class spell_warl_curse_of_doom : public SpellScriptLoader GetCaster()->CastSpell(GetTarget(), SPELL_WARLOCK_CURSE_OF_DOOM_EFFECT, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_warl_curse_of_doom_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_curse_of_doom_AuraScript(); } @@ -281,14 +281,14 @@ class spell_warl_demonic_circle_summon : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectRemove += AuraEffectApplyFn(spell_warl_demonic_circle_summon_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); OnEffectPeriodic += AuraEffectPeriodicFn(spell_warl_demonic_circle_summon_AuraScript::HandleDummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_demonic_circle_summon_AuraScript(); } @@ -316,13 +316,13 @@ class spell_warl_demonic_circle_teleport : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectApply += AuraEffectApplyFn(spell_warl_demonic_circle_teleport_AuraScript::HandleTeleport, EFFECT_0, SPELL_AURA_MECHANIC_IMMUNITY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_demonic_circle_teleport_AuraScript(); } @@ -338,7 +338,7 @@ class spell_warl_demonic_empowerment : public SpellScriptLoader { PrepareSpellScript(spell_warl_demonic_empowerment_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_DEMONIC_EMPOWERMENT_SUCCUBUS) || !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_DEMONIC_EMPOWERMENT_VOIDWALKER) || !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_DEMONIC_EMPOWERMENT_FELGUARD) || !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_DEMONIC_EMPOWERMENT_FELHUNTER) || !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_DEMONIC_EMPOWERMENT_IMP)) return false; @@ -379,13 +379,13 @@ class spell_warl_demonic_empowerment : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warl_demonic_empowerment_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warl_demonic_empowerment_SpellScript(); } @@ -409,13 +409,13 @@ class spell_warl_everlasting_affliction : public SpellScriptLoader aur->GetBase()->RefreshDuration(); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warl_everlasting_affliction_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warl_everlasting_affliction_SpellScript(); } @@ -431,7 +431,7 @@ class spell_warl_fel_synergy : public SpellScriptLoader { PrepareAuraScript(spell_warl_fel_synergy_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_FEL_SYNERGY_HEAL)) return false; @@ -451,14 +451,14 @@ class spell_warl_fel_synergy : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_WARLOCK_FEL_SYNERGY_HEAL, SPELLVALUE_BASE_POINT0, heal, (Unit*)NULL, true, NULL, aurEff); // TARGET_UNIT_PET } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_warl_fel_synergy_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_warl_fel_synergy_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_fel_synergy_AuraScript(); } @@ -481,7 +481,7 @@ class spell_warl_haunt : public SpellScriptLoader aurEff->SetAmount(CalculatePct(aurEff->GetAmount(), GetHitDamage())); } - void Register() + void Register() OVERRIDE { OnHit += SpellHitFn(spell_warl_haunt_SpellScript::HandleOnHit); } @@ -491,7 +491,7 @@ class spell_warl_haunt : public SpellScriptLoader { PrepareAuraScript(spell_warl_haunt_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_HAUNT_HEAL)) return false; @@ -507,18 +507,18 @@ class spell_warl_haunt : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectRemove += AuraEffectApplyFn(spell_warl_haunt_AuraScript::HandleRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warl_haunt_SpellScript(); } - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_haunt_AuraScript(); } @@ -554,14 +554,14 @@ class spell_warl_health_funnel : public SpellScriptLoader target->RemoveAurasDueToSpell(SPELL_WARLOCK_IMPROVED_HEALTH_FUNNEL_BUFF_R2); } - void Register() + void Register() OVERRIDE { OnEffectRemove += AuraEffectRemoveFn(spell_warl_health_funnel_AuraScript::RemoveEffect, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL); OnEffectApply += AuraEffectApplyFn(spell_warl_health_funnel_AuraScript::ApplyEffect, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_health_funnel_AuraScript(); } @@ -577,12 +577,12 @@ class spell_warl_life_tap : public SpellScriptLoader { PrepareSpellScript(spell_warl_life_tap_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_LIFE_TAP_ENERGIZE) || !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_LIFE_TAP_ENERGIZE_2)) return false; @@ -626,14 +626,14 @@ class spell_warl_life_tap : public SpellScriptLoader return SPELL_FAILED_FIZZLE; } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warl_life_tap_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); OnCheckCast += SpellCheckCastFn(spell_warl_life_tap_SpellScript::CheckCast); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warl_life_tap_SpellScript(); } @@ -655,13 +655,13 @@ class spell_warl_ritual_of_doom_effect : public SpellScriptLoader caster->CastSpell(caster, GetEffectValue(), true); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_warl_ritual_of_doom_effect_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warl_ritual_of_doom_effect_SpellScript(); } @@ -683,13 +683,13 @@ class spell_warl_seed_of_corruption : public SpellScriptLoader targets.remove(GetExplTargetUnit()); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_warl_seed_of_corruption_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warl_seed_of_corruption_SpellScript(); } @@ -720,13 +720,13 @@ class spell_warl_shadow_ward : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_shadow_ward_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_shadow_ward_AuraScript(); } @@ -742,7 +742,7 @@ class spell_warl_siphon_life : public SpellScriptLoader { PrepareAuraScript(spell_warl_siphon_life_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_SIPHON_LIFE_HEAL)) return false; @@ -768,14 +768,14 @@ class spell_warl_siphon_life : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_WARLOCK_SIPHON_LIFE_HEAL, SPELLVALUE_BASE_POINT0, amount, GetTarget(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_warl_siphon_life_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_warl_siphon_life_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_siphon_life_AuraScript(); } @@ -791,7 +791,7 @@ class spell_warl_soulshatter : public SpellScriptLoader { PrepareSpellScript(spell_warl_soulshatter_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_SOULSHATTER)) return false; @@ -808,13 +808,13 @@ class spell_warl_soulshatter : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warl_soulshatter_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warl_soulshatter_SpellScript(); } @@ -830,7 +830,7 @@ class spell_warl_unstable_affliction : public SpellScriptLoader { PrepareAuraScript(spell_warl_unstable_affliction_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_UNSTABLE_AFFLICTION_DISPEL)) return false; @@ -848,13 +848,13 @@ class spell_warl_unstable_affliction : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { AfterDispel += AuraDispelFn(spell_warl_unstable_affliction_AuraScript::HandleDispel); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_unstable_affliction_AuraScript(); } diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index 7136f046873..9e7ca75890f 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -92,14 +92,14 @@ class spell_warr_bloodthirst : public SpellScriptLoader GetCaster()->CastCustomSpell(GetCaster(), SPELL_WARRIOR_BLOODTHIRST, &damage, NULL, NULL, true, NULL); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warr_bloodthirst_SpellScript::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); OnEffectHit += SpellEffectFn(spell_warr_bloodthirst_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warr_bloodthirst_SpellScript(); } @@ -121,13 +121,13 @@ class spell_warr_bloodthirst_heal : public SpellScriptLoader SetHitHeal(GetCaster()->CountPctFromMaxHealth(spellInfo->Effects[EFFECT_1].CalcValue(GetCaster()))); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warr_bloodthirst_heal_SpellScript::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warr_bloodthirst_heal_SpellScript(); } @@ -143,7 +143,7 @@ class spell_warr_charge : public SpellScriptLoader { PrepareSpellScript(spell_warr_charge_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_JUGGERNAUT_CRIT_BONUS_TALENT) || !sSpellMgr->GetSpellInfo(SPELL_WARRIOR_JUGGERNAUT_CRIT_BONUS_BUFF) || !sSpellMgr->GetSpellInfo(SPELL_WARRIOR_CHARGE)) return false; @@ -161,13 +161,13 @@ class spell_warr_charge : public SpellScriptLoader caster->CastSpell(caster, SPELL_WARRIOR_JUGGERNAUT_CRIT_BONUS_BUFF, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warr_charge_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warr_charge_SpellScript(); } @@ -188,13 +188,13 @@ class spell_warr_concussion_blow : public SpellScriptLoader SetHitDamage(CalculatePct(GetCaster()->GetTotalAttackPowerValue(BASE_ATTACK), GetEffectValue())); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warr_concussion_blow_SpellScript::HandleDummy, EFFECT_2, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warr_concussion_blow_SpellScript(); } @@ -210,7 +210,7 @@ class spell_warr_damage_shield : public SpellScriptLoader { PrepareAuraScript(spell_warr_damage_shield_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_DAMAGE_SHIELD_DAMAGE)) return false; @@ -226,13 +226,13 @@ class spell_warr_damage_shield : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_WARRIOR_DAMAGE_SHIELD_DAMAGE, SPELLVALUE_BASE_POINT0, damage, eventInfo.GetProcTarget(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { OnEffectProc += AuraEffectProcFn(spell_warr_damage_shield_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warr_damage_shield_AuraScript(); } @@ -248,7 +248,7 @@ class spell_warr_deep_wounds : public SpellScriptLoader { PrepareSpellScript(spell_warr_deep_wounds_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_DEEP_WOUNDS_RANK_1) || !sSpellMgr->GetSpellInfo(SPELL_WARRIOR_DEEP_WOUNDS_RANK_2) || !sSpellMgr->GetSpellInfo(SPELL_WARRIOR_DEEP_WOUNDS_RANK_3)) return false; @@ -281,13 +281,13 @@ class spell_warr_deep_wounds : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warr_deep_wounds_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warr_deep_wounds_SpellScript(); } @@ -303,7 +303,7 @@ class spell_warr_execute : public SpellScriptLoader { PrepareSpellScript(spell_warr_execute_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_EXECUTE) || !sSpellMgr->GetSpellInfo(SPELL_WARRIOR_GLYPH_OF_EXECUTION)) return false; @@ -337,13 +337,13 @@ class spell_warr_execute : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warr_execute_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warr_execute_SpellScript(); } @@ -365,13 +365,13 @@ class spell_warr_improved_spell_reflection : public SpellScriptLoader unitList.remove(GetCaster()); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_warr_improved_spell_reflection_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_PARTY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warr_improved_spell_reflection_SpellScript(); } @@ -392,14 +392,14 @@ class spell_warr_intimidating_shout : public SpellScriptLoader unitList.remove(GetExplTargetWorldObject()); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_warr_intimidating_shout_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_warr_intimidating_shout_SpellScript::FilterTargets, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warr_intimidating_shout_SpellScript(); } @@ -415,7 +415,7 @@ class spell_warr_last_stand : public SpellScriptLoader { PrepareSpellScript(spell_warr_last_stand_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_LAST_STAND_TRIGGERED)) return false; @@ -431,13 +431,13 @@ class spell_warr_last_stand : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_warr_last_stand_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warr_last_stand_SpellScript(); } @@ -469,13 +469,13 @@ class spell_warr_overpower : public SpellScriptLoader target->CastSpell(target, spellId, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warr_overpower_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_ANY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warr_overpower_SpellScript(); } @@ -515,13 +515,13 @@ class spell_warr_rend : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warr_rend_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warr_rend_AuraScript(); } @@ -546,13 +546,13 @@ class spell_warr_shattering_throw : public SpellScriptLoader target->RemoveAurasWithMechanic(1 << MECHANIC_IMMUNE_SHIELD, AURA_REMOVE_BY_ENEMY_SPELL); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warr_shattering_throw_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warr_shattering_throw_SpellScript(); } @@ -568,7 +568,7 @@ class spell_warr_slam : public SpellScriptLoader { PrepareSpellScript(spell_warr_slam_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_SLAM)) return false; @@ -582,13 +582,13 @@ class spell_warr_slam : public SpellScriptLoader GetCaster()->CastCustomSpell(GetHitUnit(), SPELL_WARRIOR_SLAM, &bp0, NULL, NULL, true, 0); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warr_slam_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warr_slam_SpellScript(); } @@ -604,14 +604,14 @@ class spell_warr_sweeping_strikes : public SpellScriptLoader { PrepareAuraScript(spell_warr_sweeping_strikes_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_SWEEPING_STRIKES_EXTRA_ATTACK)) return false; return true; } - bool Load() + bool Load() OVERRIDE { _procTarget = NULL; return true; @@ -629,7 +629,7 @@ class spell_warr_sweeping_strikes : public SpellScriptLoader GetTarget()->CastSpell(_procTarget, SPELL_WARRIOR_SWEEPING_STRIKES_EXTRA_ATTACK, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_warr_sweeping_strikes_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_warr_sweeping_strikes_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); @@ -639,7 +639,7 @@ class spell_warr_sweeping_strikes : public SpellScriptLoader Unit* _procTarget; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warr_sweeping_strikes_AuraScript(); } @@ -655,7 +655,7 @@ class spell_warr_vigilance : public SpellScriptLoader { PrepareAuraScript(spell_warr_vigilance_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_GLYPH_OF_VIGILANCE)) return false; @@ -668,7 +668,7 @@ class spell_warr_vigilance : public SpellScriptLoader return true; } - bool Load() + bool Load() OVERRIDE { _procTarget = NULL; return true; @@ -720,7 +720,7 @@ class spell_warr_vigilance : public SpellScriptLoader GetTarget()->CastSpell(_procTarget, SPELL_WARRIOR_VIGILANCE_PROC, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { OnEffectApply += AuraEffectApplyFn(spell_warr_vigilance_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); AfterEffectApply += AuraEffectApplyFn(spell_warr_vigilance_AuraScript::HandleAfterApply, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); @@ -733,7 +733,7 @@ class spell_warr_vigilance : public SpellScriptLoader Unit* _procTarget; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warr_vigilance_AuraScript(); } @@ -758,13 +758,13 @@ class spell_warr_vigilance_trigger : public SpellScriptLoader target->RemoveSpellCooldown(SPELL_WARRIOR_TAUNT, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warr_vigilance_trigger_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warr_vigilance_trigger_SpellScript(); } diff --git a/src/server/scripts/World/achievement_scripts.cpp b/src/server/scripts/World/achievement_scripts.cpp index d0ffe5214db..774c4e63071 100644 --- a/src/server/scripts/World/achievement_scripts.cpp +++ b/src/server/scripts/World/achievement_scripts.cpp @@ -31,7 +31,7 @@ class achievement_resilient_victory : public AchievementCriteriaScript public: achievement_resilient_victory() : AchievementCriteriaScript("achievement_resilient_victory") { } - bool OnCheck(Player* source, Unit* /*target*/) + bool OnCheck(Player* source, Unit* /*target*/) OVERRIDE { Battleground* bg = source->GetBattleground(); if (!bg) @@ -52,7 +52,7 @@ class achievement_bg_control_all_nodes : public AchievementCriteriaScript public: achievement_bg_control_all_nodes() : AchievementCriteriaScript("achievement_bg_control_all_nodes") { } - bool OnCheck(Player* source, Unit* /*target*/) + bool OnCheck(Player* source, Unit* /*target*/) OVERRIDE { Battleground* bg = source->GetBattleground(); if (!bg) @@ -70,7 +70,7 @@ class achievement_save_the_day : public AchievementCriteriaScript public: achievement_save_the_day() : AchievementCriteriaScript("achievement_save_the_day") { } - bool OnCheck(Player* source, Unit* target) + bool OnCheck(Player* source, Unit* target) OVERRIDE { if (!target) return false; @@ -96,7 +96,7 @@ class achievement_bg_ic_resource_glut : public AchievementCriteriaScript public: achievement_bg_ic_resource_glut() : AchievementCriteriaScript("achievement_bg_ic_resource_glut") { } - bool OnCheck(Player* source, Unit* /*target*/) + bool OnCheck(Player* source, Unit* /*target*/) OVERRIDE { if (source->HasAura(SPELL_OIL_REFINERY) && source->HasAura(SPELL_QUARRY)) return true; @@ -110,7 +110,7 @@ class achievement_bg_ic_glaive_grave : public AchievementCriteriaScript public: achievement_bg_ic_glaive_grave() : AchievementCriteriaScript("achievement_bg_ic_glaive_grave") { } - bool OnCheck(Player* source, Unit* /*target*/) + bool OnCheck(Player* source, Unit* /*target*/) OVERRIDE { if (Creature* vehicle = source->GetVehicleCreatureBase()) { @@ -127,7 +127,7 @@ class achievement_bg_ic_mowed_down : public AchievementCriteriaScript public: achievement_bg_ic_mowed_down() : AchievementCriteriaScript("achievement_bg_ic_mowed_down") { } - bool OnCheck(Player* source, Unit* /*target*/) + bool OnCheck(Player* source, Unit* /*target*/) OVERRIDE { if (Creature* vehicle = source->GetVehicleCreatureBase()) { @@ -144,7 +144,7 @@ class achievement_bg_sa_artillery : public AchievementCriteriaScript public: achievement_bg_sa_artillery() : AchievementCriteriaScript("achievement_bg_sa_artillery") { } - bool OnCheck(Player* source, Unit* /*target*/) + bool OnCheck(Player* source, Unit* /*target*/) OVERRIDE { if (Creature* vehicle = source->GetVehicleCreatureBase()) { @@ -164,7 +164,7 @@ class achievement_arena_kills : public AchievementCriteriaScript { } - bool OnCheck(Player* source, Unit* /*target*/) + bool OnCheck(Player* source, Unit* /*target*/) OVERRIDE { // this checks GetBattleground() for NULL already if (!source->InArena()) @@ -182,7 +182,7 @@ class achievement_sickly_gazelle : public AchievementCriteriaScript public: achievement_sickly_gazelle() : AchievementCriteriaScript("achievement_sickly_gazelle") { } - bool OnCheck(Player* /*source*/, Unit* target) + bool OnCheck(Player* /*source*/, Unit* target) OVERRIDE { if (!target) return false; @@ -200,7 +200,7 @@ class achievement_everything_counts : public AchievementCriteriaScript public: achievement_everything_counts() : AchievementCriteriaScript("achievement_everything_counts") { } - bool OnCheck(Player* source, Unit* /*target*/) + bool OnCheck(Player* source, Unit* /*target*/) OVERRIDE { Battleground* bg = source->GetBattleground(); if (!bg) @@ -221,7 +221,7 @@ class achievement_bg_av_perfection : public AchievementCriteriaScript public: achievement_bg_av_perfection() : AchievementCriteriaScript("achievement_bg_av_perfection") { } - bool OnCheck(Player* source, Unit* /*target*/) + bool OnCheck(Player* source, Unit* /*target*/) OVERRIDE { Battleground* bg = source->GetBattleground(); if (!bg) @@ -244,7 +244,7 @@ class achievement_bg_sa_defense_of_ancients : public AchievementCriteriaScript { } - bool OnCheck(Player* player, Unit* /*target*/) + bool OnCheck(Player* player, Unit* /*target*/) OVERRIDE { if (!player) return false; @@ -278,7 +278,7 @@ class achievement_tilted : public AchievementCriteriaScript public: achievement_tilted() : AchievementCriteriaScript("achievement_tilted") {} - bool OnCheck(Player* player, Unit* /*target*/) + bool OnCheck(Player* player, Unit* /*target*/) OVERRIDE { if (!player) return false; @@ -299,7 +299,7 @@ class achievement_not_even_a_scratch : public AchievementCriteriaScript public: achievement_not_even_a_scratch() : AchievementCriteriaScript("achievement_not_even_a_scratch") { } - bool OnCheck(Player* source, Unit* /*target*/) + bool OnCheck(Player* source, Unit* /*target*/) OVERRIDE { if (!source) return false; @@ -327,7 +327,7 @@ class achievement_flirt_with_disaster_perf_check : public AchievementCriteriaScr public: achievement_flirt_with_disaster_perf_check() : AchievementCriteriaScript("achievement_flirt_with_disaster_perf_check") { } - bool OnCheck(Player* player, Unit* /*target*/) + bool OnCheck(Player* player, Unit* /*target*/) OVERRIDE { if (!player) return false; diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index 388a4fbfcf2..1b43ee30cd1 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -57,7 +57,7 @@ class AreaTrigger_at_coilfang_waterfall : public AreaTriggerScript { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) + bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) OVERRIDE { if (GameObject* go = GetClosestGameObjectWithEntry(player, GO_COILFANG_WATERFALL, 35.0f)) if (go->getLootState() == GO_READY) @@ -89,7 +89,7 @@ class AreaTrigger_at_legion_teleporter : public AreaTriggerScript { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) + bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) OVERRIDE { if (player->IsAlive() && !player->IsInCombat()) { @@ -131,7 +131,7 @@ class AreaTrigger_at_stormwright_shelf : public AreaTriggerScript { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) + bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) OVERRIDE { if (!player->isDead() && player->GetQuestStatus(QUEST_STRENGTH_OF_THE_TEMPEST) == QUEST_STATUS_INCOMPLETE) player->CastSpell(player, SPELL_CREATE_TRUE_POWER_OF_THE_TEMPEST, false); @@ -159,7 +159,7 @@ class AreaTrigger_at_scent_larkorwi : public AreaTriggerScript { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) + bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) OVERRIDE { if (!player->isDead() && player->GetQuestStatus(QUEST_SCENT_OF_LARKORWI) == QUEST_STATUS_INCOMPLETE) { @@ -190,7 +190,7 @@ class AreaTrigger_at_last_rites : public AreaTriggerScript { } - bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) + bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) OVERRIDE { if (!(player->GetQuestStatus(QUEST_LAST_RITES) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(QUEST_LAST_RITES) == QUEST_STATUS_COMPLETE || @@ -245,7 +245,7 @@ class AreaTrigger_at_sholazar_waygate : public AreaTriggerScript AreaTrigger_at_sholazar_waygate() : AreaTriggerScript("at_sholazar_waygate") {} - bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) + bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) OVERRIDE { if (!player->isDead() && (player->GetQuestStatus(QUEST_MEETING_A_GREAT_ONE) != QUEST_STATUS_NONE || (player->GetQuestStatus(QUEST_THE_MAKERS_OVERLOOK) == QUEST_STATUS_REWARDED && player->GetQuestStatus(QUEST_THE_MAKERS_PERCH) == QUEST_STATUS_REWARDED))) @@ -282,7 +282,7 @@ class AreaTrigger_at_nats_landing : public AreaTriggerScript public: AreaTrigger_at_nats_landing() : AreaTriggerScript("at_nats_landing") { } - bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) + bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) OVERRIDE { if (!player->IsAlive() || !player->HasAura(SPELL_FISH_PASTE)) return false; @@ -327,7 +327,7 @@ class AreaTrigger_at_brewfest : public AreaTriggerScript _triggerTimes[AT_BREWFEST_DUROTAR] = _triggerTimes[AT_BREWFEST_DUN_MOROGH] = 0; } - bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) + bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) OVERRIDE { uint32 triggerId = trigger->id; // Second trigger happened too early after first, skip for now @@ -380,7 +380,7 @@ class AreaTrigger_at_area_52_entrance : public AreaTriggerScript _triggerTimes[AT_AREA_52_SOUTH] = _triggerTimes[AT_AREA_52_NORTH] = _triggerTimes[AT_AREA_52_WEST] = _triggerTimes[AT_AREA_52_EAST] = 0; } - bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) + bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) OVERRIDE { float x = 0.0f, y = 0.0f, z = 0.0f; @@ -452,7 +452,7 @@ public: stormforgedEradictorGUID = 0; } - bool OnTrigger(Player* player, AreaTriggerEntry const* /* trigger */) + bool OnTrigger(Player* player, AreaTriggerEntry const* /* trigger */) OVERRIDE { if (player->GetQuestStatus(QUEST_THE_LONESOME_WATCHER) != QUEST_STATUS_INCOMPLETE) return false; diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp index 663127e8cf3..ca0083a1268 100644 --- a/src/server/scripts/World/boss_emerald_dragons.cpp +++ b/src/server/scripts/World/boss_emerald_dragons.cpp @@ -94,7 +94,7 @@ struct emerald_dragonAI : public WorldBossAI { } - void Reset() + void Reset() OVERRIDE { WorldBossAI::Reset(); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE); @@ -106,14 +106,14 @@ struct emerald_dragonAI : public WorldBossAI } // Target killed during encounter, mark them as suspectible for Aura Of Nature - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (who->GetTypeId() == TYPEID_PLAYER) who->CastSpell(who, SPELL_MARK_OF_NATURE, true); } // Execute and reschedule base events shared between all Emerald Dragons - void ExecuteEvent(uint32 eventId) + void ExecuteEvent(uint32 eventId) OVERRIDE { switch (eventId) { @@ -137,7 +137,7 @@ struct emerald_dragonAI : public WorldBossAI } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -172,12 +172,12 @@ class npc_dream_fog : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _roamTimer = 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -209,7 +209,7 @@ class npc_dream_fog : public CreatureScript uint32 _roamTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_dream_fogAI(creature); } @@ -249,21 +249,21 @@ class boss_ysondre : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _stage = 1; emerald_dragonAI::Reset(); events.ScheduleEvent(EVENT_LIGHTNING_WAVE, 12000); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { Talk(SAY_YSONDRE_AGGRO); WorldBossAI::EnterCombat(who); } // Summon druid spirits on 75%, 50% and 25% health - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE { if (!HealthAbovePct(100 - 25 * _stage)) { @@ -275,7 +275,7 @@ class boss_ysondre : public CreatureScript } } - void ExecuteEvent(uint32 eventId) + void ExecuteEvent(uint32 eventId) OVERRIDE { switch (eventId) { @@ -293,7 +293,7 @@ class boss_ysondre : public CreatureScript uint8 _stage; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_ysondreAI(creature); } @@ -337,20 +337,20 @@ class boss_lethon : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _stage = 1; emerald_dragonAI::Reset(); events.ScheduleEvent(EVENT_SHADOW_BOLT_WHIRL, 10000); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { Talk(SAY_LETHON_AGGRO); WorldBossAI::EnterCombat(who); } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE { if (!HealthAbovePct(100 - 25 * _stage)) { @@ -360,7 +360,7 @@ class boss_lethon : public CreatureScript } } - void SpellHitTarget(Unit* target, SpellInfo const* spell) + void SpellHitTarget(Unit* target, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_DRAW_SPIRIT && target->GetTypeId() == TYPEID_PLAYER) { @@ -370,7 +370,7 @@ class boss_lethon : public CreatureScript } } - void ExecuteEvent(uint32 eventId) + void ExecuteEvent(uint32 eventId) OVERRIDE { switch (eventId) { @@ -388,7 +388,7 @@ class boss_lethon : public CreatureScript uint8 _stage; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_lethonAI(creature); } @@ -405,13 +405,13 @@ class npc_spirit_shade : public CreatureScript { } - void IsSummonedBy(Unit* summoner) + void IsSummonedBy(Unit* summoner) OVERRIDE { _summonerGuid = summoner->GetGUID(); me->GetMotionMaster()->MoveFollow(summoner, 0.0f, 0.0f); } - void MovementInform(uint32 moveType, uint32 data) + void MovementInform(uint32 moveType, uint32 data) OVERRIDE { if (moveType == FOLLOW_MOTION_TYPE && data == _summonerGuid) { @@ -424,7 +424,7 @@ class npc_spirit_shade : public CreatureScript uint64 _summonerGuid; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_spirit_shadeAI(creature); } @@ -460,27 +460,27 @@ class boss_emeriss : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { _stage = 1; emerald_dragonAI::Reset(); events.ScheduleEvent(EVENT_VOLATILE_INFECTION, 12000); } - void KilledUnit(Unit* who) + void KilledUnit(Unit* who) OVERRIDE { if (who->GetTypeId() == TYPEID_PLAYER) DoCast(who, SPELL_PUTRID_MUSHROOM, true); emerald_dragonAI::KilledUnit(who); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { Talk(SAY_EMERISS_AGGRO); WorldBossAI::EnterCombat(who); } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE { if (!HealthAbovePct(100 - 25 * _stage)) { @@ -490,7 +490,7 @@ class boss_emeriss : public CreatureScript } } - void ExecuteEvent(uint32 eventId) + void ExecuteEvent(uint32 eventId) OVERRIDE { switch (eventId) { @@ -508,7 +508,7 @@ class boss_emeriss : public CreatureScript uint8 _stage; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_emerissAI(creature); } @@ -552,7 +552,7 @@ class boss_taerar : public CreatureScript { } - void Reset() + void Reset() OVERRIDE { me->RemoveAurasDueToSpell(SPELL_SHADE); _stage = 1; @@ -566,18 +566,18 @@ class boss_taerar : public CreatureScript events.ScheduleEvent(EVENT_BELLOWING_ROAR, 30000); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { Talk(SAY_TAERAR_AGGRO); emerald_dragonAI::EnterCombat(who); } - void SummonedCreatureDies(Creature* /*summon*/, Unit* /*killer*/) + void SummonedCreatureDies(Creature* /*summon*/, Unit* /*killer*/) OVERRIDE { --_shades; } - void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) + void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) OVERRIDE { // At 75, 50 or 25 percent health, we need to activate the shades and go "banished" // Note: _stage holds the amount of times they have been summoned @@ -604,7 +604,7 @@ class boss_taerar : public CreatureScript } } - void ExecuteEvent(uint32 eventId) + void ExecuteEvent(uint32 eventId) OVERRIDE { switch (eventId) { @@ -622,7 +622,7 @@ class boss_taerar : public CreatureScript } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!me->IsInCombat()) return; @@ -658,7 +658,7 @@ class boss_taerar : public CreatureScript uint8 _stage; // check which "shade phase" we're at (75-50-25 percentage counters) }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new boss_taerarAI(creature); } @@ -695,13 +695,13 @@ class spell_dream_fog_sleep : public SpellScriptLoader targets.remove_if(DreamFogTargetSelector()); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dream_fog_sleep_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dream_fog_sleep_SpellScript(); } @@ -734,7 +734,7 @@ class spell_mark_of_nature : public SpellScriptLoader { PrepareSpellScript(spell_mark_of_nature_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MARK_OF_NATURE)) return false; @@ -754,14 +754,14 @@ class spell_mark_of_nature : public SpellScriptLoader GetHitUnit()->CastSpell(GetHitUnit(), SPELL_AURA_OF_NATURE, true); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mark_of_nature_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnEffectHitTarget += SpellEffectFn(spell_mark_of_nature_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_mark_of_nature_SpellScript(); } diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 57846aba9ff..1847e3390ef 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -72,7 +72,7 @@ class go_cat_figurine : public GameObjectScript public: go_cat_figurine() : GameObjectScript("go_cat_figurine") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) + bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE { player->CastSpell(player, SPELL_SUMMON_GHOST_SABER, true); return false; @@ -87,7 +87,7 @@ class go_northern_crystal_pylon : public GameObjectScript public: go_northern_crystal_pylon() : GameObjectScript("go_northern_crystal_pylon") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (go->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) { @@ -107,7 +107,7 @@ class go_eastern_crystal_pylon : public GameObjectScript public: go_eastern_crystal_pylon() : GameObjectScript("go_eastern_crystal_pylon") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (go->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) { @@ -127,7 +127,7 @@ class go_western_crystal_pylon : public GameObjectScript public: go_western_crystal_pylon() : GameObjectScript("go_western_crystal_pylon") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (go->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) { @@ -151,7 +151,7 @@ class go_barov_journal : public GameObjectScript public: go_barov_journal() : GameObjectScript("go_barov_journal") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) + bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE { if (player->HasSkill(SKILL_TAILORING) && player->GetBaseSkillValue(SKILL_TAILORING) >= 280 && !player->HasSpell(26086)) player->CastSpell(player, 26095, false); @@ -169,7 +169,7 @@ class go_field_repair_bot_74A : public GameObjectScript public: go_field_repair_bot_74A() : GameObjectScript("go_field_repair_bot_74A") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) + bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE { if (player->HasSkill(SKILL_ENGINEERING) && player->GetBaseSkillValue(SKILL_ENGINEERING) >= 300 && !player->HasSpell(22704)) player->CastSpell(player, 22864, false); @@ -192,7 +192,7 @@ class go_gilded_brazier : public GameObjectScript public: go_gilded_brazier() : GameObjectScript("go_gilded_brazier") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (go->GetGoType() == GAMEOBJECT_TYPE_GOOBER) { @@ -215,7 +215,7 @@ class go_orb_of_command : public GameObjectScript public: go_orb_of_command() : GameObjectScript("go_orb_of_command") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) + bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE { if (player->GetQuestRewardStatus(7761)) player->CastSpell(player, 23460, true); @@ -233,7 +233,7 @@ class go_tablet_of_madness : public GameObjectScript public: go_tablet_of_madness() : GameObjectScript("go_tablet_of_madness") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) + bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE { if (player->HasSkill(SKILL_ALCHEMY) && player->GetSkillValue(SKILL_ALCHEMY) >= 300 && !player->HasSpell(24266)) player->CastSpell(player, 24267, false); @@ -252,7 +252,7 @@ public: go_tablet_of_the_seven() : GameObjectScript("go_tablet_of_the_seven") { } /// @todo use gossip option ("Transcript the Tablet") instead, if Trinity adds support. - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (go->GetGoType() != GAMEOBJECT_TYPE_QUESTGIVER) return true; @@ -273,7 +273,7 @@ class go_jump_a_tron : public GameObjectScript public: go_jump_a_tron() : GameObjectScript("go_jump_a_tron") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) + bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE { if (player->GetQuestStatus(10111) == QUEST_STATUS_INCOMPLETE) player->CastSpell(player, 33382, true); @@ -307,7 +307,7 @@ class go_ethereum_prison : public GameObjectScript public: go_ethereum_prison() : GameObjectScript("go_ethereum_prison") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { go->UseDoorOrButton(); int Random = rand() % (sizeof(NpcPrisonEntry) / sizeof(uint32)); @@ -357,7 +357,7 @@ class go_ethereum_stasis : public GameObjectScript public: go_ethereum_stasis() : GameObjectScript("go_ethereum_stasis") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { go->UseDoorOrButton(); int Random = rand() % (sizeof(NpcStasisEntry) / sizeof(uint32)); @@ -383,7 +383,7 @@ class go_resonite_cask : public GameObjectScript public: go_resonite_cask() : GameObjectScript("go_resonite_cask") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE { if (go->GetGoType() == GAMEOBJECT_TYPE_GOOBER) go->SummonCreature(NPC_GOGGEROC, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 300000); @@ -406,7 +406,7 @@ class go_sacred_fire_of_life : public GameObjectScript public: go_sacred_fire_of_life() : GameObjectScript("go_sacred_fire_of_life") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (go->GetGoType() == GAMEOBJECT_TYPE_GOOBER) player->SummonCreature(NPC_ARIKARA, -5008.338f, -2118.894f, 83.657f, 0.874f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); @@ -434,7 +434,7 @@ class go_shrine_of_the_birds : public GameObjectScript public: go_shrine_of_the_birds() : GameObjectScript("go_shrine_of_the_birds") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { uint32 BirdEntry = 0; @@ -477,7 +477,7 @@ class go_southfury_moonstone : public GameObjectScript public: go_southfury_moonstone() : GameObjectScript("go_southfury_moonstone") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) + bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE { //implicitTarget=48 not implemented as of writing this code, and manual summon may be just ok for our purpose //player->CastSpell(player, SPELL_SUMMON_RIZZLE, false); @@ -506,7 +506,7 @@ class go_tele_to_dalaran_crystal : public GameObjectScript public: go_tele_to_dalaran_crystal() : GameObjectScript("go_tele_to_dalaran_crystal") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) + bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE { if (player->GetQuestRewardStatus(QUEST_TELE_CRYSTAL_FLAG)) return false; @@ -526,7 +526,7 @@ class go_tele_to_violet_stand : public GameObjectScript public: go_tele_to_violet_stand() : GameObjectScript("go_tele_to_violet_stand") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) + bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE { if (player->GetQuestRewardStatus(QUEST_LEARN_LEAVE_RETURN) || player->GetQuestStatus(QUEST_LEARN_LEAVE_RETURN) == QUEST_STATUS_INCOMPLETE) return false; @@ -556,7 +556,7 @@ class go_fel_crystalforge : public GameObjectScript public: go_fel_crystalforge() : GameObjectScript("go_fel_crystalforge") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (go->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) /* != GAMEOBJECT_TYPE_QUESTGIVER) */ player->PrepareQuestMenu(go->GetGUID()); /* return true*/ @@ -569,7 +569,7 @@ public: 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(); switch (action) @@ -615,7 +615,7 @@ class go_bashir_crystalforge : public GameObjectScript public: go_bashir_crystalforge() : GameObjectScript("go_bashir_crystalforge") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (go->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) /* != GAMEOBJECT_TYPE_QUESTGIVER) */ player->PrepareQuestMenu(go->GetGUID()); /* return true*/ @@ -628,7 +628,7 @@ public: 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(); switch (action) @@ -679,7 +679,7 @@ class go_matrix_punchograph : public GameObjectScript public: go_matrix_punchograph() : GameObjectScript("go_matrix_punchograph") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { switch (go->GetEntry()) { @@ -732,7 +732,7 @@ class go_scourge_cage : public GameObjectScript public: go_scourge_cage() : GameObjectScript("go_scourge_cage") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { go->UseDoorOrButton(); if (Creature* pNearestPrisoner = go->FindNearestCreature(NPC_SCOURGE_PRISONER, 5.0f, true)) @@ -760,7 +760,7 @@ class go_arcane_prison : public GameObjectScript public: go_arcane_prison() : GameObjectScript("go_arcane_prison") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (player->GetQuestStatus(QUEST_PRISON_BREAK) == QUEST_STATUS_INCOMPLETE) { @@ -787,7 +787,7 @@ class go_blood_filled_orb : public GameObjectScript public: go_blood_filled_orb() : GameObjectScript("go_blood_filled_orb") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (go->GetGoType() == GAMEOBJECT_TYPE_GOOBER) player->SummonCreature(NPC_ZELEMAR, -369.746f, 166.759f, -21.50f, 5.235f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); @@ -818,7 +818,7 @@ class go_jotunheim_cage : public GameObjectScript public: go_jotunheim_cage() : GameObjectScript("go_jotunheim_cage") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { go->UseDoorOrButton(); Creature* pPrisoner = go->FindNearestCreature(NPC_EBON_BLADE_PRISONER_HUMAN, 5.0f, true); @@ -868,7 +868,7 @@ class go_table_theka : public GameObjectScript public: go_table_theka() : GameObjectScript("go_table_theka") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (player->GetQuestStatus(QUEST_SPIDER_GOLD) == QUEST_STATUS_INCOMPLETE) player->AreaExploredOrEventHappens(QUEST_SPIDER_GOLD); @@ -894,7 +894,7 @@ class go_inconspicuous_landmark : public GameObjectScript public: go_inconspicuous_landmark() : GameObjectScript("go_inconspicuous_landmark") { } - bool OnGossipHello(Player* player, GameObject* /*go*/) + bool OnGossipHello(Player* player, GameObject* /*go*/) OVERRIDE { if (player->HasItemCount(ITEM_CUERGOS_KEY)) return false; @@ -920,7 +920,7 @@ class go_ethereal_teleport_pad : public GameObjectScript public: go_ethereal_teleport_pad() : GameObjectScript("go_ethereal_teleport_pad") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { if (!player->HasItemCount(ITEM_TELEPORTER_POWER_PACK)) return false; @@ -1000,7 +1000,7 @@ class go_soulwell : public GameObjectScript /// _and_ CMSG_GAMEOBJECT_REPORT_USE, this GossipHello hook is called /// twice. The script's handling is fine as it won't remove two charges /// on the well. We have to find how to segregate REPORT_USE and USE. - bool GossipHello(Player* player) + bool GossipHello(Player* player) OVERRIDE { Unit* owner = go->GetOwner(); if (_stoneSpell == 0 || _stoneId == 0) @@ -1030,7 +1030,7 @@ class go_soulwell : public GameObjectScript uint32 _stoneId; }; - GameObjectAI* GetAI(GameObject* go) const + GameObjectAI* GetAI(GameObject* go) const OVERRIDE { return new go_soulwellAI(go); } @@ -1055,7 +1055,7 @@ class go_dragonflayer_cage : public GameObjectScript public: go_dragonflayer_cage() : GameObjectScript("go_dragonflayer_cage") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { go->UseDoorOrButton(); if (player->GetQuestStatus(QUEST_PRISONERS_OF_WYRMSKULL) != QUEST_STATUS_INCOMPLETE) @@ -1103,7 +1103,7 @@ class go_tadpole_cage : public GameObjectScript public: go_tadpole_cage() : GameObjectScript("go_tadpole_cage") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { go->UseDoorOrButton(); if (player->GetQuestStatus(QUEST_OH_NOES_THE_TADPOLES) == QUEST_STATUS_INCOMPLETE) @@ -1144,7 +1144,7 @@ class go_amberpine_outhouse : public GameObjectScript public: go_amberpine_outhouse() : GameObjectScript("go_amberpine_outhouse") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { QuestStatus status = player->GetQuestStatus(QUEST_DOING_YOUR_DUTY); if (status == QUEST_STATUS_INCOMPLETE || status == QUEST_STATUS_COMPLETE || status == QUEST_STATUS_REWARDED) @@ -1158,7 +1158,7 @@ public: 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(); if (action == GOSSIP_ACTION_INFO_DEF +1) @@ -1200,7 +1200,7 @@ class go_hive_pod : public GameObjectScript public: go_hive_pod() : GameObjectScript("go_hive_pod") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { player->SendLoot(go->GetGUID(), LOOT_CORPSE); go->SummonCreature(NPC_HIVE_AMBUSHER, go->GetPositionX()+1, go->GetPositionY(), go->GetPositionZ(), go->GetAngle(player), TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000); @@ -1214,7 +1214,7 @@ class go_massive_seaforium_charge : public GameObjectScript public: go_massive_seaforium_charge() : GameObjectScript("go_massive_seaforium_charge") { } - bool OnGossipHello(Player* /*player*/, GameObject* go) + bool OnGossipHello(Player* /*player*/, GameObject* go) OVERRIDE { go->SetLootState(GO_JUST_DEACTIVATED); return true; @@ -1238,7 +1238,7 @@ class go_gjalerbron_cage : public GameObjectScript public: go_gjalerbron_cage() : GameObjectScript("go_gjalerbron_cage") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { go->UseDoorOrButton(); if ((player->GetTeamId() == TEAM_ALLIANCE && player->GetQuestStatus(QUEST_ALLIANCE_OF_KEYS_AND_CAGES) == QUEST_STATUS_INCOMPLETE) || @@ -1266,7 +1266,7 @@ class go_large_gjalerbron_cage : public GameObjectScript public: go_large_gjalerbron_cage() : GameObjectScript("go_large_gjalerbron_cage") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { go->UseDoorOrButton(); if ((player->GetTeamId() == TEAM_ALLIANCE && player->GetQuestStatus(QUEST_ALLIANCE_OF_KEYS_AND_CAGES) == QUEST_STATUS_INCOMPLETE) || @@ -1301,7 +1301,7 @@ class go_veil_skith_cage : public GameObjectScript public: go_veil_skith_cage() : GameObjectScript("go_veil_skith_cage") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { go->UseDoorOrButton(); if (player->GetQuestStatus(QUEST_MISSING_FRIENDS) == QUEST_STATUS_INCOMPLETE) @@ -1338,7 +1338,7 @@ class go_frostblade_shrine : public GameObjectScript public: go_frostblade_shrine() : GameObjectScript("go_frostblade_shrine") { } - bool OnGossipHello(Player* player, GameObject* go) + bool OnGossipHello(Player* player, GameObject* go) OVERRIDE { go->UseDoorOrButton(10); if (!player->HasAura(SPELL_RECENT_MEDITATION)) @@ -1365,7 +1365,7 @@ class go_midsummer_bonfire : public GameObjectScript public: go_midsummer_bonfire() : GameObjectScript("go_midsummer_bonfire") { } - bool OnGossipSelect(Player* player, GameObject* /*go*/, uint32 /*sender*/, uint32 /*action*/) + bool OnGossipSelect(Player* player, GameObject* /*go*/, uint32 /*sender*/, uint32 /*action*/) OVERRIDE { player->CastSpell(player, STAMP_OUT_BONFIRE_QUEST_COMPLETE, true); player->CLOSE_GOSSIP_MENU(); diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp index 32b362c47c2..f83d35b4039 100644 --- a/src/server/scripts/World/guards.cpp +++ b/src/server/scripts/World/guards.cpp @@ -56,13 +56,13 @@ public: { guard_genericAI(Creature* creature) : GuardAI(creature) {} - void Reset() + void Reset() OVERRIDE { globalCooldown = 0; buffTimer = 0; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (me->GetEntry() == NPC_CENARION_HOLD_INFANTRY) Talk(SAY_GUARD_SIL_AGGRO, who->GetGUID()); @@ -70,7 +70,7 @@ public: DoCast(who, spell->Id); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Always decrease our global cooldown first if (globalCooldown > diff) @@ -219,7 +219,7 @@ public: } } - void ReceiveEmote(Player* player, uint32 textEmote) + void ReceiveEmote(Player* player, uint32 textEmote) OVERRIDE { switch (me->GetEntry()) { @@ -242,7 +242,7 @@ public: uint32 buffTimer; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new guard_genericAI(creature); } @@ -265,7 +265,7 @@ public: { guard_shattrath_scryerAI(Creature* creature) : GuardAI(creature) {} - void Reset() + void Reset() OVERRIDE { banishTimer = 5000; exileTimer = 8500; @@ -273,7 +273,7 @@ public: canTeleport = false; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -315,7 +315,7 @@ public: bool canTeleport; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new guard_shattrath_scryerAI(creature); } @@ -330,7 +330,7 @@ public: { guard_shattrath_aldorAI(Creature* creature) : GuardAI(creature) {} - void Reset() + void Reset() OVERRIDE { banishTimer = 5000; exileTimer = 8500; @@ -338,7 +338,7 @@ public: canTeleport = false; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -379,7 +379,7 @@ public: bool canTeleport; }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new guard_shattrath_aldorAI(creature); } diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp index b4bc9720e74..7b6cb90f6c9 100644 --- a/src/server/scripts/World/item_scripts.cpp +++ b/src/server/scripts/World/item_scripts.cpp @@ -49,7 +49,7 @@ class item_only_for_flight : public ItemScript public: item_only_for_flight() : ItemScript("item_only_for_flight") { } - bool OnUse(Player* player, Item* item, SpellCastTargets const& /*targets*/) + bool OnUse(Player* player, Item* item, SpellCastTargets const& /*targets*/) OVERRIDE { uint32 itemId = item->GetEntry(); bool disabled = false; @@ -90,7 +90,7 @@ class item_nether_wraith_beacon : public ItemScript public: item_nether_wraith_beacon() : ItemScript("item_nether_wraith_beacon") { } - bool OnUse(Player* player, Item* /*item*/, SpellCastTargets const& /*targets*/) + bool OnUse(Player* player, Item* /*item*/, SpellCastTargets const& /*targets*/) OVERRIDE { if (player->GetQuestStatus(10832) == QUEST_STATUS_INCOMPLETE) { @@ -113,7 +113,7 @@ class item_gor_dreks_ointment : public ItemScript public: item_gor_dreks_ointment() : ItemScript("item_gor_dreks_ointment") { } - bool OnUse(Player* player, Item* item, SpellCastTargets const& targets) + bool OnUse(Player* player, Item* item, SpellCastTargets const& targets) OVERRIDE { if (targets.GetUnitTarget() && targets.GetUnitTarget()->GetTypeId() == TYPEID_UNIT && targets.GetUnitTarget()->GetEntry() == 20748 && !targets.GetUnitTarget()->HasAura(32578)) @@ -133,7 +133,7 @@ class item_incendiary_explosives : public ItemScript public: item_incendiary_explosives() : ItemScript("item_incendiary_explosives") { } - bool OnUse(Player* player, Item* item, SpellCastTargets const & /*targets*/) + bool OnUse(Player* player, Item* item, SpellCastTargets const & /*targets*/) OVERRIDE { if (player->FindNearestCreature(26248, 15) || player->FindNearestCreature(26249, 15)) return false; @@ -154,7 +154,7 @@ class item_mysterious_egg : public ItemScript public: item_mysterious_egg() : ItemScript("item_mysterious_egg") { } - bool OnExpire(Player* player, ItemTemplate const* /*pItemProto*/) + bool OnExpire(Player* player, ItemTemplate const* /*pItemProto*/) OVERRIDE { ItemPosCountVec dest; uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 39883, 1); // Cracked Egg @@ -174,7 +174,7 @@ class item_disgusting_jar : public ItemScript public: item_disgusting_jar() : ItemScript("item_disgusting_jar") {} - bool OnExpire(Player* player, ItemTemplate const* /*pItemProto*/) + bool OnExpire(Player* player, ItemTemplate const* /*pItemProto*/) OVERRIDE { ItemPosCountVec dest; uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 44718, 1); // Ripe Disgusting Jar @@ -223,7 +223,7 @@ class item_pile_fake_furs : public ItemScript public: item_pile_fake_furs() : ItemScript("item_pile_fake_furs") { } - bool OnUse(Player* player, Item* /*item*/, SpellCastTargets const & /*targets*/) + bool OnUse(Player* player, Item* /*item*/, SpellCastTargets const & /*targets*/) OVERRIDE { GameObject* go = NULL; for (uint8 i = 0; i < CaribouTrapsNum; ++i) @@ -268,7 +268,7 @@ class item_petrov_cluster_bombs : public ItemScript public: item_petrov_cluster_bombs() : ItemScript("item_petrov_cluster_bombs") { } - bool OnUse(Player* player, Item* item, const SpellCastTargets & /*targets*/) + bool OnUse(Player* player, Item* item, const SpellCastTargets & /*targets*/) OVERRIDE { if (player->GetZoneId() != ZONE_ID_HOWLING) return false; @@ -334,7 +334,7 @@ class item_dehta_trap_smasher : public ItemScript public: item_dehta_trap_smasher() : ItemScript("item_dehta_trap_smasher") { } - bool OnUse(Player* player, Item* /*item*/, const SpellCastTargets & /*targets*/) + bool OnUse(Player* player, Item* /*item*/, const SpellCastTargets & /*targets*/) OVERRIDE { if (player->GetQuestStatus(QUEST_CANNOT_HELP_THEMSELVES) != QUEST_STATUS_INCOMPLETE) return false; @@ -370,7 +370,7 @@ class item_trident_of_nazjan : public ItemScript public: item_trident_of_nazjan() : ItemScript("item_Trident_of_Nazjan") { } - bool OnUse(Player* player, Item* item, const SpellCastTargets & /*targets*/) + bool OnUse(Player* player, Item* item, const SpellCastTargets & /*targets*/) OVERRIDE { if (player->GetQuestStatus(QUEST_THE_EMISSARY) == QUEST_STATUS_INCOMPLETE) { @@ -397,7 +397,7 @@ class item_captured_frog : public ItemScript public: item_captured_frog() : ItemScript("item_captured_frog") { } - bool OnUse(Player* player, Item* item, SpellCastTargets const& /*targets*/) + bool OnUse(Player* player, Item* item, SpellCastTargets const& /*targets*/) OVERRIDE { if (player->GetQuestStatus(QUEST_THE_PERFECT_SPIES) == QUEST_STATUS_INCOMPLETE) { diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp index f9b08d17f9b..3891de93261 100644 --- a/src/server/scripts/World/mob_generic_creature.cpp +++ b/src/server/scripts/World/mob_generic_creature.cpp @@ -42,20 +42,20 @@ public: uint32 BuffTimer; //This variable keeps track of buffs bool IsSelfRooted; - void Reset() + void Reset() OVERRIDE { GlobalCooldown = 0; BuffTimer = 0; //Rebuff as soon as we can IsSelfRooted = false; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) OVERRIDE { if (!me->IsWithinMeleeRange(who)) IsSelfRooted = true; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { //Always decrease our global cooldown first if (GlobalCooldown > diff) @@ -163,7 +163,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new generic_creatureAI(creature); } @@ -186,7 +186,7 @@ public: uint32 timer, interval; const SpellInfo* spell; - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (timer <= diff) { @@ -199,7 +199,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new trigger_periodicAI(creature); } @@ -213,14 +213,14 @@ public: struct trigger_deathAI : public NullCreatureAI { trigger_deathAI(Creature* creature) : NullCreatureAI(creature) {} - void JustDied(Unit* killer) + void JustDied(Unit* killer) OVERRIDE { if (me->m_spells[0]) me->CastSpell(killer, me->m_spells[0], true); } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new trigger_deathAI(creature); } diff --git a/src/server/scripts/World/npc_innkeeper.cpp b/src/server/scripts/World/npc_innkeeper.cpp index 358bf997508..9c92dd0d27e 100644 --- a/src/server/scripts/World/npc_innkeeper.cpp +++ b/src/server/scripts/World/npc_innkeeper.cpp @@ -49,7 +49,7 @@ class npc_innkeeper : public CreatureScript public: npc_innkeeper() : CreatureScript("npc_innkeeper") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (IsHolidayActive(HOLIDAY_HALLOWS_END) && !player->HasAura(SPELL_TRICK_OR_TREATED)) { @@ -86,7 +86,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 && IsHolidayActive(HOLIDAY_HALLOWS_END) && !player->HasAura(SPELL_TRICK_OR_TREATED)) diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp index 4180005ff3d..fb36dbefa1f 100644 --- a/src/server/scripts/World/npc_professions.cpp +++ b/src/server/scripts/World/npc_professions.cpp @@ -382,7 +382,7 @@ public: return (player->HasSpell(S_TRANSMUTE) || player->HasSpell(S_ELIXIR) || player->HasSpell(S_POTION)); } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -508,7 +508,7 @@ public: } } - 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 (sender) @@ -547,7 +547,7 @@ public: return (player->HasSpell(S_HAMMER) || player->HasSpell(S_AXE) || player->HasSpell(S_SWORD)); } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -738,7 +738,7 @@ public: } } - 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 (sender) @@ -808,7 +808,7 @@ public: return res; } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { uint32 npcTextId = 0; std::string gossipItem; @@ -848,7 +848,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) @@ -886,7 +886,7 @@ class npc_prof_leather : public CreatureScript public: npc_prof_leather() : CreatureScript("npc_prof_leather") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -974,7 +974,7 @@ public: } } - 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 (sender) @@ -1009,7 +1009,7 @@ public: return (player->HasSpell(S_MOONCLOTH) || player->HasSpell(S_SHADOWEAVE) || player->HasSpell(S_SPELLFIRE)); } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -1136,7 +1136,7 @@ public: } } - 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 (sender) diff --git a/src/server/scripts/World/npc_taxi.cpp b/src/server/scripts/World/npc_taxi.cpp index 5e1e205dd98..bf742d606f2 100644 --- a/src/server/scripts/World/npc_taxi.cpp +++ b/src/server/scripts/World/npc_taxi.cpp @@ -65,7 +65,7 @@ class npc_taxi : public CreatureScript public: npc_taxi() : CreatureScript("npc_taxi") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -182,7 +182,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) diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index bf3f0fe3a8c..77bfb2956e8 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -159,7 +159,7 @@ public: SpawnAssociation* SpawnAssoc; uint64 SpawnedGUID; - void Reset() {} + void Reset() OVERRIDE {} Creature* SummonGuard() { @@ -186,7 +186,8 @@ public: return NULL; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!SpawnAssoc) return; @@ -262,7 +263,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_air_force_botsAI(creature); } @@ -288,7 +289,7 @@ class npc_lunaclaw_spirit : public CreatureScript public: npc_lunaclaw_spirit() : CreatureScript("npc_lunaclaw_spirit") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (player->GetQuestStatus(QUEST_BODY_HEART_A) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(QUEST_BODY_HEART_H) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_GRANT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -297,7 +298,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) @@ -335,16 +336,16 @@ public: uint32 ResetFlagTimer; - void Reset() + void Reset() OVERRIDE { ResetFlagTimer = 120000; me->setFaction(FACTION_CHICKEN); me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); } - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { // Reset flags after a certain time has passed so that the next player has to start the 'event' again if (me->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER)) @@ -362,7 +363,7 @@ public: DoMeleeAttackIfReady(); } - void ReceiveEmote(Player* player, uint32 emote) + void ReceiveEmote(Player* player, uint32 emote) OVERRIDE { switch (emote) { @@ -386,12 +387,12 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_chicken_cluckAI(creature); } - bool OnQuestAccept(Player* /*player*/, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* /*player*/, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_CLUCK) CAST_AI(npc_chicken_cluck::npc_chicken_cluckAI, creature->AI())->Reset(); @@ -399,7 +400,7 @@ public: return true; } - bool OnQuestComplete(Player* /*player*/, Creature* creature, Quest const* quest) + bool OnQuestComplete(Player* /*player*/, Creature* creature, Quest const* quest) OVERRIDE { if (quest->GetQuestId() == QUEST_CLUCK) CAST_AI(npc_chicken_cluck::npc_chicken_cluckAI, creature->AI())->Reset(); @@ -431,7 +432,7 @@ public: bool Active; uint32 CanIteract; - void Reset() + void Reset() OVERRIDE { Active = true; CanIteract = 3500; @@ -447,7 +448,7 @@ public: me->SendMessageToSet(&data, true); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!Active) { @@ -462,9 +463,9 @@ public: } } - void EnterCombat(Unit* /*who*/){} + void EnterCombat(Unit* /*who*/)OVERRIDE {} - void ReceiveEmote(Player* player, uint32 emote) + void ReceiveEmote(Player* player, uint32 emote) OVERRIDE { if (me->IsWithinLOS(player->GetPositionX(), player->GetPositionY(), player->GetPositionZ()) && me->IsWithinDistInMap(player, 30.0f)) { @@ -497,7 +498,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_dancing_flamesAI(creature); } @@ -591,7 +592,7 @@ public: std::list<uint64> Patients; std::vector<Location*> Coordinates; - void Reset() + void Reset() OVERRIDE { PlayerGUID = 0; @@ -692,12 +693,12 @@ public: } } - void UpdateAI(uint32 diff); + void UpdateAI(uint32 diff) OVERRIDE; - void EnterCombat(Unit* /*who*/){} + void EnterCombat(Unit* /*who*/) OVERRIDE {} }; - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) + bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE { if ((quest->GetQuestId() == 6624) || (quest->GetQuestId() == 6622)) CAST_AI(npc_doctor::npc_doctorAI, creature->AI())->BeginEvent(player); @@ -705,7 +706,7 @@ public: return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_doctorAI(creature); } @@ -727,7 +728,7 @@ public: uint64 DoctorGUID; Location* Coord; - void Reset() + void Reset() OVERRIDE { DoctorGUID = 0; Coord = NULL; @@ -760,9 +761,9 @@ public: } } - void EnterCombat(Unit* /*who*/){} + void EnterCombat(Unit* /*who*/)OVERRIDE {} - void SpellHit(Unit* caster, SpellInfo const* spell) + void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE { Player* player = caster->ToPlayer(); if (!player || !me->IsAlive() || spell->Id != 20804) @@ -802,7 +803,7 @@ public: } } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { //lower HP on every world tick makes it a useful counter, not officlone though if (me->IsAlive() && me->GetHealth() > 6) @@ -822,7 +823,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_injured_patientAI(creature); } @@ -929,7 +930,7 @@ public: uint32 RunAwayTimer; - void Reset() + void Reset() OVERRIDE { CasterGUID = 0; @@ -943,9 +944,9 @@ public: me->SetHealth(me->CountPctFromMaxHealth(70)); } - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void SpellHit(Unit* caster, SpellInfo const* spell) + void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE { if (spell->Id == SPELL_LESSER_HEAL_R2 || spell->Id == SPELL_FORTITUDE_R1) { @@ -1055,12 +1056,12 @@ public: } } - void WaypointReached(uint32 /*waypointId*/) + void WaypointReached(uint32 /*waypointId*/) OVERRIDE { } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (CanRun && !me->IsInCombat()) { @@ -1102,7 +1103,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_garments_of_questsAI(creature); } @@ -1126,16 +1127,16 @@ public: { npc_guardianAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() + void Reset() OVERRIDE { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void EnterCombat(Unit* /*who*/) + void EnterCombat(Unit* /*who*/) OVERRIDE { } - void UpdateAI(uint32 /*diff*/) + void UpdateAI(uint32 /*diff*/) OVERRIDE { if (!UpdateVictim()) return; @@ -1148,7 +1149,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_guardianAI(creature); } @@ -1163,7 +1164,7 @@ class npc_mount_vendor : public CreatureScript public: npc_mount_vendor() : CreatureScript("npc_mount_vendor") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -1238,7 +1239,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_TRADE) @@ -1261,7 +1262,7 @@ class npc_rogue_trainer : public CreatureScript public: npc_rogue_trainer() : CreatureScript("npc_rogue_trainer") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -1285,7 +1286,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) @@ -1370,7 +1371,7 @@ class npc_sayge : public CreatureScript public: npc_sayge() : CreatureScript("npc_sayge") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -1439,7 +1440,7 @@ public: } } - 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 (sender) @@ -1501,8 +1502,8 @@ public: { npc_steam_tonkAI(Creature* creature) : ScriptedAI(creature) {} - void Reset() {} - void EnterCombat(Unit* /*who*/) {} + void Reset() OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} void OnPossess(bool apply) { @@ -1519,7 +1520,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_steam_tonkAI(creature); } @@ -1544,16 +1545,17 @@ public: uint32 ExplosionTimer; - void Reset() + void Reset() OVERRIDE { ExplosionTimer = 3000; } - void EnterCombat(Unit* /*who*/) {} - void AttackStart(Unit* /*who*/) {} - void MoveInLineOfSight(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} + void AttackStart(Unit* /*who*/) OVERRIDE {} + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} + - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (ExplosionTimer <= diff) { @@ -1565,7 +1567,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_tonk_mineAI(creature); } @@ -1583,7 +1585,7 @@ public: struct npc_brewfest_revelerAI : public ScriptedAI { npc_brewfest_revelerAI(Creature* creature) : ScriptedAI(creature) {} - void ReceiveEmote(Player* player, uint32 emote) + void ReceiveEmote(Player* player, uint32 emote) OVERRIDE { if (!IsHolidayActive(HOLIDAY_BREWFEST)) return; @@ -1593,7 +1595,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_brewfest_revelerAI(creature); } @@ -1625,9 +1627,9 @@ public: uint32 SpellTimer; bool IsViper; - void EnterCombat(Unit* /*who*/) {} + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void Reset() + void Reset() OVERRIDE { SpellTimer = 0; @@ -1649,7 +1651,8 @@ public: } //Redefined for random target selection: - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) OVERRIDE + { if (!me->GetVictim() && me->CanCreatureAttack(who)) { @@ -1669,7 +1672,7 @@ public: } } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -1711,7 +1714,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_snake_trap_serpentsAI(creature); } @@ -1737,7 +1740,7 @@ public: npc_mojoAI(Creature* creature) : ScriptedAI(creature) {Reset();} uint32 hearts; uint64 victimGUID; - void Reset() + void Reset() OVERRIDE { victimGUID = 0; hearts = 15000; @@ -1745,9 +1748,9 @@ public: me->GetMotionMaster()->MoveFollow(own, 0, 0); } - void EnterCombat(Unit* /*who*/){} + void EnterCombat(Unit* /*who*/)OVERRIDE {} - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (me->HasAura(20372)) { @@ -1759,7 +1762,7 @@ public: } } - void ReceiveEmote(Player* player, uint32 emote) + void ReceiveEmote(Player* player, uint32 emote) OVERRIDE { me->HandleEmoteCommand(emote); Unit* owner = me->GetOwner(); @@ -1812,7 +1815,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_mojoAI(creature); } @@ -1827,7 +1830,7 @@ public: { npc_mirror_imageAI(Creature* creature) : CasterAI(creature) {} - void InitializeAI() + void InitializeAI() OVERRIDE { CasterAI::InitializeAI(); Unit* owner = me->GetOwner(); @@ -1842,7 +1845,7 @@ public: } // Do not reload Creature templates on evade mode enter - prevent visual lost - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { if (me->IsInEvadeMode() || !me->IsAlive()) return; @@ -1858,7 +1861,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_mirror_imageAI(creature); } @@ -1875,7 +1878,7 @@ public: uint32 despawnTimer; - void InitializeAI() + void InitializeAI() OVERRIDE { CasterAI::InitializeAI(); uint64 ownerGuid = me->GetOwnerGUID(); @@ -1896,7 +1899,7 @@ public: } } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { // Stop Feeding Gargoyle when it dies if (Unit* owner = me->GetOwner()) @@ -1904,7 +1907,7 @@ public: } // Fly away when dismissed - void SpellHit(Unit* source, SpellInfo const* spell) + void SpellHit(Unit* source, SpellInfo const* spell) OVERRIDE { if (spell->Id != 50515 || !me->IsAlive()) return; @@ -1935,7 +1938,7 @@ public: despawnTimer = 4 * IN_MILLISECONDS; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (despawnTimer > 0) { @@ -1949,7 +1952,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_ebon_gargoyleAI(creature); } @@ -1967,7 +1970,7 @@ class npc_lightwell : public CreatureScript DoCast(me, 59907, false); } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { if (!me->IsAlive()) return; @@ -1978,7 +1981,7 @@ class npc_lightwell : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_lightwellAI(creature); } @@ -2007,7 +2010,7 @@ public: uint32 resetTimer; uint32 despawnTimer; - void Reset() + void Reset() OVERRIDE { me->SetControlled(true, UNIT_STATE_STUNNED);//disable rotate me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_KNOCK_BACK, true);//imune to knock aways like blast wave @@ -2016,7 +2019,7 @@ public: despawnTimer = 15000; } - void EnterEvadeMode() + void EnterEvadeMode() OVERRIDE { if (!_EnterEvadeMode()) return; @@ -2024,13 +2027,13 @@ public: Reset(); } - void DamageTaken(Unit* /*doneBy*/, uint32& damage) + void DamageTaken(Unit* /*doneBy*/, uint32& damage) OVERRIDE { resetTimer = 5000; damage = 0; } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -2057,10 +2060,11 @@ public: despawnTimer -= diff; } } - void MoveInLineOfSight(Unit* /*who*/){return;} + + void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_training_dummyAI(creature); } @@ -2081,7 +2085,7 @@ class npc_shadowfiend : public CreatureScript { npc_shadowfiendAI(Creature* creature) : PetAI(creature) {} - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) OVERRIDE { if (me->IsSummon()) if (Unit* owner = me->ToTempSummon()->GetSummoner()) @@ -2090,7 +2094,7 @@ class npc_shadowfiend : public CreatureScript } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_shadowfiendAI(creature); } @@ -2120,7 +2124,7 @@ public: uint32 FireShield_Timer; uint32 FireBlast_Timer; - void Reset() + void Reset() OVERRIDE { FireNova_Timer = 5000 + rand() % 15000; // 5-20 sec cd FireBlast_Timer = 5000 + rand() % 15000; // 5-20 sec cd @@ -2128,7 +2132,7 @@ public: me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -2164,7 +2168,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_fire_elementalAI(creature); } @@ -2190,13 +2194,13 @@ public: uint32 AngeredEarth_Timer; - void Reset() + void Reset() OVERRIDE { AngeredEarth_Timer = 0; me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, true); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (!UpdateVictim()) return; @@ -2213,7 +2217,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_earth_elementalAI(creature); } @@ -2253,12 +2257,12 @@ class npc_wormhole : public CreatureScript { npc_wormholeAI(Creature* creature) : PassiveAI(creature) {} - void InitializeAI() + void InitializeAI() OVERRIDE { _showUnderground = urand(0, 100) == 0; // Guessed value, it is really rare though } - uint32 GetData(uint32 type) const + uint32 GetData(uint32 type) const OVERRIDE { return (type == DATA_SHOW_UNDERGROUND && _showUnderground) ? 1 : 0; } @@ -2267,7 +2271,7 @@ class npc_wormhole : public CreatureScript bool _showUnderground; }; - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsSummon()) { @@ -2289,7 +2293,7 @@ class npc_wormhole : 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(); @@ -2324,7 +2328,7 @@ class npc_wormhole : public CreatureScript return true; } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_wormholeAI(creature); } @@ -2351,7 +2355,7 @@ class npc_pet_trainer : public CreatureScript public: npc_pet_trainer() : CreatureScript("npc_pet_trainer") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); @@ -2369,7 +2373,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) @@ -2446,7 +2450,7 @@ class npc_locksmith : public CreatureScript public: npc_locksmith() : CreatureScript("npc_locksmith") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { // Arcatraz Key if (player->GetQuestRewardStatus(QUEST_HOW_TO_BRAKE_IN_TO_THE_ARCATRAZ) && !player->HasItemCount(ITEM_ARCATRAZ_KEY, 1, true)) @@ -2491,7 +2495,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) @@ -2551,7 +2555,7 @@ class npc_experience : public CreatureScript public: npc_experience() : CreatureScript("npc_experience") { } - bool OnGossipHello(Player* player, Creature* creature) + bool OnGossipHello(Player* player, Creature* creature) OVERRIDE { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_XP_OFF, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_XP_ON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -2559,7 +2563,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(); bool noXPGain = player->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_NO_XP_GAIN); @@ -2828,7 +2832,7 @@ public: return 0; } - void Reset() + void Reset() OVERRIDE { if (GameObject* launcher = FindNearestLauncher()) { @@ -2873,7 +2877,7 @@ public: } }; - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_fireworkAI(creature); } @@ -2898,7 +2902,7 @@ class npc_spring_rabbit : public CreatureScript public: npc_spring_rabbit() : CreatureScript("npc_spring_rabbit") { } - CreatureAI* GetAI(Creature* creature) const + CreatureAI* GetAI(Creature* creature) const OVERRIDE { return new npc_spring_rabbitAI(creature); } @@ -2913,7 +2917,7 @@ public: uint32 searchTimer; uint64 rabbitGUID; - void Reset() + void Reset() OVERRIDE { inLove = false; rabbitGUID = 0; @@ -2924,16 +2928,16 @@ public: me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE); } - void EnterCombat(Unit* /*who*/) { } + void EnterCombat(Unit* /*who*/) OVERRIDE {} - void DoAction(int32 /*param*/) + void DoAction(int32 /*param*/) OVERRIDE { inLove = true; if (Unit* owner = me->GetOwner()) owner->CastSpell(owner, SPELL_SPRING_FLING, true); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) OVERRIDE { if (inLove) { diff --git a/src/server/shared/Define.h b/src/server/shared/Define.h index 682167a96e3..d18f160aeaf 100644 --- a/src/server/shared/Define.h +++ b/src/server/shared/Define.h @@ -70,6 +70,14 @@ # define ATTR_DEPRECATED #endif //COMPILER == COMPILER_GNU +#if COMPILER_HAS_CPP11_SUPPORT +# define OVERRIDE override +# define FINAL final +#else +# define OVERRIDE +# define FINAL +#endif //COMPILER_HAS_CPP11_SUPPORT + #define UI64FMTD ACE_UINT64_FORMAT_SPECIFIER #define UI64LIT(N) ACE_UINT64_LITERAL(N) |